diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 4717682..dc928c7 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -13,9 +13,6 @@
             barbican:
               source: pkg
               name: salt-formula-barbican
-            billometer:
-              source: pkg
-              name: salt-formula-billometer
             ceilometer:
               source: pkg
               name: salt-formula-ceilometer
@@ -100,6 +97,3 @@
             statsd:
               source: pkg
               name: salt-formula-statsd
-            supervisor:
-              source: pkg
-              name: salt-formula-supervisor
diff --git a/salt/master/formula/pkg/stacklight.yml b/salt/master/formula/pkg/stacklight.yml
index 4fe75c0..33fed30 100644
--- a/salt/master/formula/pkg/stacklight.yml
+++ b/salt/master/formula/pkg/stacklight.yml
@@ -16,9 +16,6 @@
             grafana:
               source: pkg
               name: salt-formula-grafana
-            graphite:
-              source: pkg
-              name: salt-formula-graphite
             heka:
               source: pkg
               name: salt-formula-heka
@@ -31,9 +28,6 @@
             kibana:
               source: pkg
               name: salt-formula-kibana
-            #nagios:
-            #  source: pkg
-            #  name: salt-formula-nagios
             postgresql:
               source: pkg
               name: salt-formula-postgresql
@@ -49,6 +43,3 @@
             sensu:
               source: pkg
               name: salt-formula-sensu
-            nagios:
-              source: pkg
-              name: salt-formula-nagios
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index 33c60d9..c61febc 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -1,7 +1,6 @@
 classes:
 - system.salt.master.single
 - system.salt.master.formula.pkg.auditd
-- system.salt.master.formula.pkg.ccp
 - system.salt.master.formula.pkg.foundation
 - system.salt.master.formula.pkg.kubernetes
 - system.salt.master.formula.pkg.openstack