diff --git a/devstack/lib/heat b/devstack/lib/heat
index dcd59b6f43..ea6a353c6c 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -333,14 +333,6 @@ function stop_heat {
     fi
 }
 
-# TODO(ramishra): Remove after Queens
-function stop_cw_service {
-    if $SYSTEMCTL is-enabled devstack@h-api-cw.service; then
-        $SYSTEMCTL stop devstack@h-api-cw.service
-        $SYSTEMCTL disable devstack@h-api-cw.service
-    fi
-}
-
 # _cleanup_heat_apache_wsgi() - Remove wsgi files, disable and remove apache vhost file
 function _cleanup_heat_apache_wsgi {
     if [[ "$WSGI_MODE" == "uwsgi" ]]; then
diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index dfe566cee2..f512e8d4d2 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -30,10 +30,6 @@ set -o xtrace
 
 stop_heat
 
-# stop cloudwatch service if running
-# TODO(ramishra): Remove it after Queens
-stop_cw_service
-
 SERVICES_DOWN="heat-api heat-engine heat-api-cfn"
 
 # sanity check that services are actually down