diff --git a/salt/master/formula/git/ccp.yml b/salt/master/formula/git/ccp.yml
index c8f1c65..f5e69bf 100644
--- a/salt/master/formula/git/ccp.yml
+++ b/salt/master/formula/git/ccp.yml
@@ -1,10 +1,11 @@
-parameters:
-  salt:
-    master:
-      environment:
-        dev:
-          formula:
-            ccp:
-              source: git
-              address: '${_param:salt_master_environment_repository}/salt-formula-ccp.git'
-              revision: ${_param:salt_master_environment_revision}
+# Deprecated since 2018.12
+#parameters:
+#  salt:
+#    master:
+#      environment:
+#        dev:
+#          formula:
+#            ccp:
+#              source: git
+#              address: '${_param:salt_master_environment_repository}/salt-formula-ccp.git'
+#              revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index 093279a..a811a52 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -16,10 +16,11 @@
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-barbican.git'
               revision: ${_param:salt_master_environment_revision}
-            billometer:
-              source: git
-              address: '${_param:salt_master_environment_repository}/salt-formula-billometer.git'
-              revision: ${_param:salt_master_environment_revision}
+# Deprecated since 2018.12
+#            billometer:
+#              source: git
+#              address: '${_param:salt_master_environment_repository}/salt-formula-billometer.git'
+#              revision: ${_param:salt_master_environment_revision}
             ceilometer:
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-ceilometer.git'
@@ -80,10 +81,11 @@
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-mysql.git'
               revision: ${_param:salt_master_environment_revision}
-            murano:
-              source: git
-              address: '${_param:salt_master_environment_repository}/salt-formula-murano.git'
-              revision: ${_param:salt_master_environment_revision}
+# Deprecated since 2018.12
+#            murano:
+#              source: git
+#              address: '${_param:salt_master_environment_repository}/salt-formula-murano.git'
+#              revision: ${_param:salt_master_environment_revision}
             neutron:
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-neutron.git'
@@ -116,19 +118,21 @@
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-rabbitmq.git'
               revision: ${_param:salt_master_environment_revision}
-            sahara:
-              source: git
-              address: '${_param:salt_master_environment_repository}/salt-formula-sahara.git'
-              revision: ${_param:salt_master_environment_revision}
+# Deprecated since 2018.12
+#            sahara:
+#              source: git
+#              address: '${_param:salt_master_environment_repository}/salt-formula-sahara.git'
+#              revision: ${_param:salt_master_environment_revision}
             statsd:
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-statsd.git'
               revision: ${_param:salt_master_environment_revision}
-            supervisor:
-              source: git
-              address: '${_param:salt_master_environment_repository}/salt-formula-supervisor.git'
-              revision: ${_param:salt_master_environment_revision}
-            swift:
-              source: git
-              address: '${_param:salt_master_environment_repository}/salt-formula-swift.git'
-              revision: ${_param:salt_master_environment_revision}
+# Deprecated since 2018.12
+#            supervisor:
+#              source: git
+#              address: '${_param:salt_master_environment_repository}/salt-formula-supervisor.git'
+#              revision: ${_param:salt_master_environment_revision}
+#            swift:
+#              source: git
+#              address: '${_param:salt_master_environment_repository}/salt-formula-swift.git'
+#              revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/git/stacklight.yml b/salt/master/formula/git/stacklight.yml
index ed07d82..05e27e9 100644
--- a/salt/master/formula/git/stacklight.yml
+++ b/salt/master/formula/git/stacklight.yml
@@ -25,10 +25,11 @@
                   enabled: true
                 grafana3_dashboard.py:
                   enabled: true
-            graphite:
-              source: git
-              address: '${_param:salt_master_environment_repository}/salt-formula-graphite.git'
-              revision: ${_param:salt_master_environment_revision}
+# Deprecated since 2018.12
+#            graphite:
+#              source: git
+#              address: '${_param:salt_master_environment_repository}/salt-formula-graphite.git'
+#              revision: ${_param:salt_master_environment_revision}
             heka:
               module:
                 heka_alarming.py: