diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/fragment/TermSelector.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/fragment/TermSelector.java
deleted file mode 100644
index 4cf097826e16cfb4b3597bb243c819995f4fcf1d..0000000000000000000000000000000000000000
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/fragment/TermSelector.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2012 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.uitest.page.fragment;
-
-import java.util.List;
-
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-
-import ch.systemsx.cisd.openbis.uitest.page.Fragment;
-
-/**
- * @author anttil
- */
-public class TermSelector extends Fragment
-{
-    @FindBy(className = "x-combo-list-item")
-    private List<WebElement> choices;
-
-    @Override
-    public void fillWith(Object value)
-    {
-        WebElement x = this.findElement(element, "span/img");
-        x.click();
-        select(choices, value.toString());
-    }
-}
diff --git a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/fragment/VarcharInput.java b/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/fragment/VarcharInput.java
deleted file mode 100644
index a9cafc3d8eb19683adbce81b2d7d1756cf67a074..0000000000000000000000000000000000000000
--- a/ui-test/source/java/ch/systemsx/cisd/openbis/uitest/page/fragment/VarcharInput.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2012 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.uitest.page.fragment;
-
-import org.openqa.selenium.WebElement;
-
-import ch.systemsx.cisd.openbis.uitest.page.Fragment;
-
-/**
- * @author anttil
- */
-public class VarcharInput extends Fragment
-{
-    @Override
-    public void fillWith(Object value)
-    {
-        WebElement x = this.findElement(element, "input");
-        x.clear();
-        x.sendKeys(value.toString());
-    }
-}