diff --git a/openbis/source/java/service.properties b/openbis/source/java/service.properties
index 8268e4f0bb2fc81006489d735e511cfb02ee1658..67051ab436149f860f0e9f6db86b9b4782477deb 100644
--- a/openbis/source/java/service.properties
+++ b/openbis/source/java/service.properties
@@ -17,14 +17,14 @@ database.script-single-step-mode = false
 database.url-host-part =
 # database.kind = new
 # database.kind = basynthec
-database.kind = yeastlab
+database.kind = dev
 # database.kind = basysbio
 # database.kind = system_test_strict
 # database.kind = system_test_plates_on_demand
 # database.kind = system_test_multi_groups
 database.owner =
-database.owner-password = 
-database.admin-user =
+database.owner-password =
+database.admin-user = 
 database.admin-password =
 
 # User id of the user used for anonymous login 
@@ -58,7 +58,7 @@ hibernate.search.index-base = ./targets/indices-${database.kind}
 # One of NO_INDEX, SKIP_IF_MARKER_FOUND, INDEX_FROM_SCRATCH.
 # If not specified, default (SKIP_IF_MARKER_FOUND) is taken.
 #hibernate.search.index-mode = INDEX_FROM_SCRATCH
-hibernate.search.index-mode = INDEX_FROM_SCRATCH
+hibernate.search.index-mode = SKIP_IF_MARKER_FOUND
 
 # Defines the maximum number of elements indexed before flushing the transaction-bound queue.
 # Default is 1000.
@@ -125,12 +125,13 @@ query-databases = 1
 #   <plugin>.start - Time of the first execution (HH:mm)
 #   <plugin>.execute-only-once - If true the task will be executed exactly once, 
 #                                interval will be ignored. By default set to false.
-maintenance-plugins = demo
-# , dynamic-property-evaluator
-demo.class = ch.systemsx.cisd.openbis.generic.server.task.RemoveUnusedUnofficialTermsMaintenanceTask
-demo.interval = 3600
+#maintenance-plugins = demo, dynamic-property-evaluator, remove-unused-ad-hoc-vocabulary-terms
+
+demo.class = ch.systemsx.cisd.openbis.generic.server.task.DemoMaintenanceTask
+demo.interval = 60
 #demo.execute-only-once = true
-demo.older-than-days = 1
+demo.property_1 = some value
+demo.property_2 = some value 2
 
 #dynamic-property-evaluator.class = ch.systemsx.cisd.openbis.generic.server.task.DynamicPropertyEvaluationMaintenanceTask
 # run daily at midnight  
@@ -139,21 +140,11 @@ demo.older-than-days = 1
 # run every 10min
 #dynamic-property-evaluator.interval = 6000
 
-
-# ---------------------------------------------------------------------------
-# custom imports configurations
-# ---------------------------------------------------------------------------
-custom-imports = import-1, import-2
-
-import-1.name = Example custom import
-import-1.dss-code = STANDARD
-import-1.dropbox-name = jython-thread
-import-1.description = "This is an example custom import"
-
-import-2.name = Another example custom import
-import-2.dss-code = STANDARD
-import-2.dropbox-name = jython-thread
-import-2.description = "This is another example custom import"
+#remove-unused-ad-hoc-vocabulary-terms.class = ch.systemsx.cisd.openbis.generic.server.task.RemoveUnusedUnofficialTermsMaintenanceTask
+## run once every 12 hours
+#remove-unused-ad-hoc-vocabulary-terms.interval = 43200
+## delete unused ad hoc terms older than 7 days
+#remove-unused-ad-hoc-vocabulary-terms.older-than-days = 7
 
 # Name of the file that stores Web Client configuration
 web-client-configuration-file = etc/web-client.properties