diff --git a/datastore_server/dist/etc/jetty-keystore b/datastore_server/dist/etc/jetty-keystore
deleted file mode 100644
index a5826327f67a2dd915237b7cf7d18bcfb225ad90..0000000000000000000000000000000000000000
Binary files a/datastore_server/dist/etc/jetty-keystore and /dev/null differ
diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index 7925bffc5a4b832776223ac35654b4c3ec491351..55a235ffac0c90f26a475319e2ec826940a1a587 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -8,7 +8,7 @@ port = 8444
 session-timeout = 30
 
 # Path to the keystore
-keystore.path = etc/jetty-keystore
+keystore.path = etc/openBIS.keystore
 
 # Password of the keystore
 keystore.password = changeit
diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index af28618f0abd2173c2c8beb743bea41327d00195..36f8e8ab5631c842f7b079f09540936153bc0513 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -8,7 +8,7 @@ port = 8889
 session-timeout = 30
 
 # Path to the keystore
-keystore.path = dist/etc/jetty-keystore
+keystore.path = dist/etc/openBIS.keystore
 
 # Password of the keystore
 keystore.password = changeit
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
index ba26e78155aed1dd3522cf18e34c743e43ecbc9a..c162760ea48deea523738641973784fbac7c0e5e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.etlserver;
 
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
+
 /**
  * Key associated with each {@link IDataStoreStrategy}.
  * 
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java
index 08928c8d74ca8c759059f3efcf7897fd67764ac2..65990253f63d9375c5f2d4a3763296a63a0023b0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Main.java
@@ -37,7 +37,6 @@ import ch.systemsx.cisd.common.Constants;
 import ch.systemsx.cisd.common.TimingParameters;
 import ch.systemsx.cisd.common.concurrent.TimerUtilities;
 import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
-import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
 import ch.systemsx.cisd.common.exceptions.HighLevelException;
 import ch.systemsx.cisd.common.exceptions.StopException;
 import ch.systemsx.cisd.common.filesystem.DirectoryScanningTimerTask;
@@ -52,7 +51,6 @@ import ch.systemsx.cisd.common.highwatermark.HostAwareFileWithHighwaterMark;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.logging.LogInitializer;
-import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
 import ch.systemsx.cisd.common.utilities.BuildAndEnvironmentInfo;
 import ch.systemsx.cisd.common.utilities.IExitHandler;
 import ch.systemsx.cisd.common.utilities.ISelfTestable;
@@ -61,7 +59,6 @@ import ch.systemsx.cisd.common.utilities.PropertyUtils;
 import ch.systemsx.cisd.common.utilities.SystemExit;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
-import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
 import ch.systemsx.cisd.openbis.generic.shared.IWebService;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
 
@@ -214,23 +211,6 @@ public final class Main
         }
     }
 
-    private static IETLLIMSService getETLLIMSService(final Parameters parameters)
-    {
-        final String serviceURL = getServiceURL(parameters) + "/rmi-etl";
-        final IETLLIMSService service = HttpInvokerUtils.createServiceStub(IETLLIMSService.class, serviceURL, 5);
-        return service;
-    }
-
-    private static String getServiceURL(final Parameters parameters)
-    {
-        final String serverURL = parameters.getServerURL();
-        if (serverURL == null)
-        {
-            throw new EnvironmentFailureException("Application Server URL is not defined.");
-        }
-        return serverURL;
-    }
-
     private static void startupServer(final Parameters parameters)
     {
         final Map<String, IProcessorFactory> processorFactories =