diff --git a/datastore_server/.classpath b/datastore_server/.classpath
index 04e90dd4e65602d006d5101dceefceb0e97e70b4..b88042c7d2e6e676720c0dfc22ed8d55d40c6e59 100644
--- a/datastore_server/.classpath
+++ b/datastore_server/.classpath
@@ -11,7 +11,6 @@
 	<classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/>
 	<classpathentry kind="lib" path="/libraries/mail/mail.jar"/>
 	<classpathentry kind="lib" path="/libraries/jmock/jmock.jar"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/bds"/>
 	<classpathentry kind="lib" path="/libraries/restrictionchecker/restrictions.jar"/>
 	<classpathentry kind="lib" path="/libraries/cglib/cglib-nodep.jar"/>
 	<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-core.jar"/>
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/HCSImageFileExtractionResult.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/HCSImageFileExtractionResult.java
deleted file mode 100644
index 4294eaaa295366056a294dbb3cc443a754fd6e8c..0000000000000000000000000000000000000000
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/HCSImageFileExtractionResult.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2008 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.etlserver;
-
-import java.util.List;
-import java.util.Set;
-
-import ch.systemsx.cisd.bds.hcs.Channel;
-import ch.systemsx.cisd.bds.storage.IFile;
-
-/**
- * Class which contains the extraction process results.
- */
-public final class HCSImageFileExtractionResult
-{
-
-    /** The duration of the process. */
-    private final long duration;
-
-    /** The total number of files found. */
-    private final int totalFiles;
-
-    /** The invalid files found. */
-    private final List<IFile> invalidFiles;
-
-    /** The channels found. */
-    private final Set<Channel> channels;
-
-    public HCSImageFileExtractionResult(final long duration, final int totalFiles,
-            final List<IFile> invalidFiles, final Set<Channel> channels)
-    {
-        this.duration = duration;
-        this.totalFiles = totalFiles;
-        this.invalidFiles = invalidFiles;
-        this.channels = channels;
-    }
-
-    /**
-     * Returns the duration of the process.
-     */
-    public final long getDuration()
-    {
-        return duration;
-    }
-
-    /**
-     * Returns the total number of files found.
-     */
-    public final int getTotalFiles()
-    {
-        return totalFiles;
-    }
-
-    /**
-     * Returns the invalid files found.
-     */
-    public final List<IFile> getInvalidFiles()
-    {
-        return invalidFiles;
-    }
-
-    /**
-     * Returns the channels found.
-     */
-    public final Set<Channel> getChannels()
-    {
-        return channels;
-    }
-}
\ No newline at end of file
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IHCSImageFileAccepter.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IHCSImageFileAccepter.java
deleted file mode 100644
index 1dbeac69dc5a9daa38f68d474b96fd43d4f671e0..0000000000000000000000000000000000000000
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IHCSImageFileAccepter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2008 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.etlserver;
-
-import ch.systemsx.cisd.bds.hcs.Location;
-import ch.systemsx.cisd.bds.storage.IFile;
-
-/**
- * Role that is implemented by <i>ETL Server</i> core system.
- * <p>
- * It is called by the <code>IHCSImageFileExtractor</code> implementation as callback to register
- * an image file at given coordinates.
- * </p>
- * 
- * @author Christian Ribeaud
- */
-public interface IHCSImageFileAccepter
-{
-    /**
-     * Registers given <var>imageFile</var> at given <code>standard</code> coordinates.
-     */
-    public void accept(final int channel, final Location wellLocation, final Location tileLocation,
-            final IFile imageFile);
-}
\ No newline at end of file