diff --git a/devstack/lib/watcher b/devstack/lib/watcher
index 68529c8af..b2b3a14fe 100644
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -123,8 +123,6 @@ function create_watcher_conf {
     iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
     iniset $WATCHER_CONF oslo_messaging_rabbit rabbit_host $RABBIT_HOST
 
-    iniset $WATCHER_CONF watcher_goals goals "DUMMY:dummy,SERVER_CONSOLIDATION:basic"
-
     configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR
     configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR "watcher_clients_auth"
 
diff --git a/devstack/local.conf.controller b/devstack/local.conf.controller
index bbad36ef9..e446cecdf 100644
--- a/devstack/local.conf.controller
+++ b/devstack/local.conf.controller
@@ -42,7 +42,3 @@ LOGDAYS=2
 [[post-config|$NOVA_CONF]]
 [DEFAULT]
 compute_monitors=cpu.virt_driver
-
-[[post-config|$WATCHER_CONF]]
-[watcher_goals]
-goals=BASIC_CONSOLIDATION:basic,DUMMY:dummy