diff --git a/devstack/lib/glance b/devstack/lib/glance
index 6a2b8bc6..5237ba4c 100644
--- a/devstack/lib/glance
+++ b/devstack/lib/glance
@@ -120,6 +120,12 @@ function configure_glance {
     fi
 }
 
+# create_glance_accounts() - Set up common required glance accounts
+function create_glance_accounts {
+    create_service_user "glance"
+}
+export -f create_glance_accounts
+
 # init_glance()
 function init_glance {
     # Delete existing images
diff --git a/devstack/lib/heat b/devstack/lib/heat
index 4f601876..df9eac91 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -272,17 +272,6 @@ function create_heat_accounts {
 	heat_cfn_api_service_url="$SERVICE_PROTOCOL://$HEAT_API_CFN_HOST/heat-api-cfn/v1"
 
         create_service_user "heat" "admin"
-        get_or_create_service "heat" "orchestration" "Heat Orchestration Service"
-        get_or_create_endpoint \
-            "orchestration" \
-            "$REGION_NAME" \
-            "$heat_api_service_url"
-
-        get_or_create_service "heat-cfn" "cloudformation" "Heat CloudFormation Service"
-        get_or_create_endpoint \
-            "cloudformation"  \
-            "$REGION_NAME" \
-            "$heat_cfn_api_service_url"
 
         # heat_stack_user role is for users created by Heat
         get_or_create_role "heat_stack_user"
diff --git a/devstack/lib/magnum b/devstack/lib/magnum
index 83bdaf9c..9d542dba 100644
--- a/devstack/lib/magnum
+++ b/devstack/lib/magnum
@@ -113,13 +113,6 @@ function create_magnum_accounts {
 
     create_service_user "magnum" "admin"
 
-    get_or_create_service "magnum" "container-infra" "Container Infrastructure Management Service"
-    get_or_create_endpoint "container-infra" \
-        "$REGION_NAME" \
-        "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST/magnum-api/v1" \
-        "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST/magnum-api/v1" \
-        "$MAGNUM_SERVICE_PROTOCOL://$MAGNUM_SERVICE_HOST/magnum-api/v1"
-
     # Create for Kubernetes Keystone auth
     get_or_create_role k8s_admin
     get_or_create_role k8s_developer