diff --git a/recipes/api-ec2.rb b/recipes/api-ec2.rb
index 730b3c3c..38600063 100644
--- a/recipes/api-ec2.rb
+++ b/recipes/api-ec2.rb
@@ -138,6 +138,5 @@ keystone_register "Register Compute Endpoint" do
   action :create_endpoint
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::api-ec2-monitoring)
 include_recipe "nova::api-ec2-monitoring"
diff --git a/recipes/api-metadata.rb b/recipes/api-metadata.rb
index 81e3a340..32e938da 100644
--- a/recipes/api-metadata.rb
+++ b/recipes/api-metadata.rb
@@ -65,6 +65,5 @@ template "/etc/nova/api-paste.ini" do
   notifies :restart, resources(:service => "nova-api-metadata"), :delayed
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::api-metadata-monitoring)
 include_recipe "nova::api-metadata-monitoring"
diff --git a/recipes/api-os-compute.rb b/recipes/api-os-compute.rb
index 5a28ef4d..b7337613 100644
--- a/recipes/api-os-compute.rb
+++ b/recipes/api-os-compute.rb
@@ -138,6 +138,5 @@ keystone_register "Register Compute Endpoint" do
   action :create_endpoint
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::api-os-compute-monitoring)
 include_recipe "nova::api-os-compute-monitoring"
diff --git a/recipes/api-os-volume.rb b/recipes/api-os-volume.rb
index 3f00dd54..864b1902 100644
--- a/recipes/api-os-volume.rb
+++ b/recipes/api-os-volume.rb
@@ -65,6 +65,5 @@ template "/etc/nova/api-paste.ini" do
   notifies :restart, resources(:service => "nova-api-os-volume"), :delayed
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::api-os-volume-monitoring)
 include_recipe "nova::api-os-volume-monitoring"
diff --git a/recipes/compute.rb b/recipes/compute.rb
index 4a1d00f7..6687c0ab 100644
--- a/recipes/compute.rb
+++ b/recipes/compute.rb
@@ -48,6 +48,5 @@ end
 
 include_recipe "nova::libvirt"
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::compute-monitoring)
 include_recipe "nova::compute-monitoring"
diff --git a/recipes/libvirt.rb b/recipes/libvirt.rb
index 43ddf208..de20e220 100644
--- a/recipes/libvirt.rb
+++ b/recipes/libvirt.rb
@@ -98,6 +98,5 @@ template "/etc/default/libvirt-bin" do
   notifies :restart, resources(:service => "libvirt-bin"), :immediately
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::libvirt-monitoring)
 include_recipe "nova::libvirt-monitoring"
diff --git a/recipes/network.rb b/recipes/network.rb
index e9592f7f..e40f2b7a 100644
--- a/recipes/network.rb
+++ b/recipes/network.rb
@@ -35,6 +35,5 @@ service "nova-network" do
   subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::network-monitoring)
 include_recipe "nova::network-monitoring"
diff --git a/recipes/scheduler.rb b/recipes/scheduler.rb
index eba02fe7..15b1766f 100644
--- a/recipes/scheduler.rb
+++ b/recipes/scheduler.rb
@@ -42,6 +42,5 @@ service "nova-scheduler" do
   subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::scheduler-monitoring)
 include_recipe "nova::scheduler-monitoring"
diff --git a/recipes/vncproxy.rb b/recipes/vncproxy.rb
index 3787cd68..97bde770 100644
--- a/recipes/vncproxy.rb
+++ b/recipes/vncproxy.rb
@@ -59,7 +59,6 @@ when "ubuntu","debian"
     subscribes :restart, resources(:template => "/etc/nova/nova.conf"), :delayed
   end
 
-  # TODO(shep): this needs to be if blocked on env collectd toggle
   # Include recipe(nova::vncproxy-monitoring)
   include_recipe "nova::vncproxy-monitoring"
 end
diff --git a/recipes/volume.rb b/recipes/volume.rb
index 44142190..27c5e987 100644
--- a/recipes/volume.rb
+++ b/recipes/volume.rb
@@ -59,6 +59,5 @@ keystone_register "Register Volume Endpoint" do
   action :create_endpoint
 end
 
-# TODO(shep): this needs to be if blocked on env collectd toggle
 # Include recipe(nova::volume-monitoring)
 include_recipe "nova::volume-monitoring"