diff --git a/integration-tests/templates/openBIS-server/service.properties b/integration-tests/templates/openBIS-server/service.properties
index 4757faf89d6ac29f1bce800313070de7b9a17e76..2e5f575fdecc02d6fd99cb3f5dcf3b36299c3a90 100644
--- a/integration-tests/templates/openBIS-server/service.properties
+++ b/integration-tests/templates/openBIS-server/service.properties
@@ -42,9 +42,6 @@ session-timeout = 30
 # Replaces the one found in the database if SYSTEM_DEFAULT.
 database-instance = CISD
 
-# Base URL of the Data Store Server
-data-store-server-base-url = https://localhost:8444
-
 # The URL of the CIFEX server
 cifex-url = https://cifex.ethz.ch:443
 
diff --git a/rtd_phosphonetx/dist/server/service.properties b/rtd_phosphonetx/dist/server/service.properties
index 28b16712c0cb82c1bb6e67e4e1d0fc0e77b9d0dc..1cecfac17650b3f06a2e3f0cd08d8fbb1a9fa58a 100644
--- a/rtd_phosphonetx/dist/server/service.properties
+++ b/rtd_phosphonetx/dist/server/service.properties
@@ -41,10 +41,6 @@ crowd.application.password =
 # The database instance local unique identifier. Used when the new database is created.
 database-instance = TEST
 
-# Base URL of the Data Store Server. 
-# Will be used only for data sets registered in an openBIS server version before 14.04.2009 (or revision 10665)
-data-store-server-base-url = 
-
 # The URL of the CIFEX server
 cifex-url = https://cifex.ethz.ch:443
 
diff --git a/rtd_phosphonetx/source/java/service.properties b/rtd_phosphonetx/source/java/service.properties
index a64d50cfa7cc9027955b7448cb62babe6be4c57f..174d45136a16a0f32429931d2d4ff4724be9b7f3 100644
--- a/rtd_phosphonetx/source/java/service.properties
+++ b/rtd_phosphonetx/source/java/service.properties
@@ -15,7 +15,7 @@ database.create-from-scratch = false
 # For debugging set this value to true.
 database.script-single-step-mode = false
 database.url-host-part =
-database.kind = phosphonetx
+database.kind = phos
 # database.kind = system_test
 # database.kind = system_test_strict
 # database.kind = system_test_plates_on_demand
@@ -29,7 +29,7 @@ phosphonetx.database.engine = postgresql
 phosphonetx.database.create-from-scratch = false
 phosphonetx.database.script-single-step-mode = false
 phosphonetx.database.url-host-part =
-phosphonetx.database.kind = dev
+phosphonetx.database.kind = phos
 phosphonetx.database.owner =
 phosphonetx.database.owner-password =
 phosphonetx.database.admin-user = 
@@ -44,10 +44,6 @@ crowd.application.password =
 # The database instance local unique identifier. Used when the new database is created.
 database-instance = CISD
 
-# Base URL of the Data Store Server. 
-# Will be used only for data sets registered in an openBIS server version before 14.04.2009 (or revision 10665)
-data-store-server-base-url = 
-
 # The URL of the CIFEX server
 cifex-url = https://cifex.ethz.ch:443
 
diff --git a/screening/source/java/service.properties b/screening/source/java/service.properties
index 707e2e149d325f2ea58380bb6f0d6b98cd0b3f9a..699cb58d957641af68722367c1a2cc80e4ab8774 100644
--- a/screening/source/java/service.properties
+++ b/screening/source/java/service.properties
@@ -41,11 +41,6 @@ mail.smtp.password = password
 # The database instance local unique identifier. Used when the new database is created.
 database-instance = CISD 
 
-
-# Base URL of the Data Store Server. 
-# Will be used only for data sets registered in an openBIS server version before 14.04.2009 (or revision 10665)
-data-store-server-base-url = http://localhost:8889/data_store
-
 # The URL of the CIFEX server
 cifex-url = https://cifex.ethz.ch:443