diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2
index 8696c12c..a1eccf85 100644
--- a/templates/glance-api.conf.j2
+++ b/templates/glance-api.conf.j2
@@ -36,7 +36,6 @@ rpc_backend = {{ glance_rpc_backend }}
 
 delayed_delete = False
 scrub_time = 43200
-scrubber_datadir = {{ glance_system_user_home }}/scrubber/
 image_cache_dir = {{ glance_system_user_home }}/cache/
 
 # defaults to true if RBD is used as default store
diff --git a/templates/glance-scrubber.conf.j2 b/templates/glance-scrubber.conf.j2
index 0769b989..5c044207 100644
--- a/templates/glance-scrubber.conf.j2
+++ b/templates/glance-scrubber.conf.j2
@@ -16,16 +16,6 @@ daemon = False
 # Loop time between checking for new items to schedule for delete
 wakeup_time = 300
 
-# Directory that the scrubber will use to remind itself of what to delete
-# Make sure this is also set in glance-api.conf
-scrubber_datadir = {{ glance_system_user_home }}/scrubber
-
-# Only one server in your deployment should be designated the cleanup host
-cleanup_scrubber = False
-
-# pending_delete items older than this time are candidates for cleanup
-cleanup_scrubber_time = 86400
-
 # Address to find the registry server for cleanups
 registry_host = {{ glance_registry_bind_address }}