diff --git a/roles/nagios_server/files/nagios/services/db_backups.cfg b/roles/nagios_server/files/nagios/services/db_backups.cfg
index 09365d1979..d991e71e5f 100644
--- a/roles/nagios_server/files/nagios/services/db_backups.cfg
+++ b/roles/nagios_server/files/nagios/services/db_backups.cfg
@@ -5,17 +5,3 @@ define service {
   use                   defaulttemplate
 }
 
-#define service {
-#  host_name		db05
-#  service_description   Check Koji PGSQL Backup
-#  check_command         check_by_nrpe!check_pgsql_koji_backup
-#  use                   defaulttemplate
-#}
-
-#define service {
-#  host_name		db05, db01
-#  service_description   Check PGSQL Backup
-#  check_command         check_by_nrpe!check_pgsql_backup
-#  use                   defaulttemplate
-#}
-
diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg
index aab84d9113..05fc218459 100644
--- a/roles/nagios_server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg
@@ -240,12 +240,7 @@ define service {
   check_command         check_by_nrpe!check_datanommer_copr
   use                   defaulttemplate
 }
-#define service {
-#  host_name             busgateway01.phx2.fedoraproject.org
-#  service_description   Check datanommer for recent trac messages
-#  check_command         check_by_nrpe!check_datanommer_trac
-#  use                   defaulttemplate
-#}
+
 define service {
   host_name             busgateway01.phx2.fedoraproject.org
   service_description   Check datanommer for recent askbot messages
@@ -288,6 +283,7 @@ define service {
   check_command         check_by_nrpe!check_datanommer_hotness
   use                   defaulttemplate
 }
+
 define service {
   host_name             busgateway01.phx2.fedoraproject.org
   service_description   Check datanommer for recent faf messages
@@ -295,14 +291,6 @@ define service {
   use                   defaulttemplate
 }
 
-# This one is retired since it times out all the time.  Too few messages.
-#define service {
-#  host_name             busgateway01.phx2.fedoraproject.org
-#  service_description   Check datanommer for recent nuancier messages
-#  check_command         check_by_nrpe!check_datanommer_nuancier
-#  use                   defaulttemplate
-#}
-
 define service {
   host_name             busgateway01.phx2.fedoraproject.org
   service_description   Check datanommer for recent mailman messages
diff --git a/roles/nagios_server/files/nagios/services/hosted.cfg b/roles/nagios_server/files/nagios/services/hosted.cfg
index 194792b75c..763261e6b3 100644
--- a/roles/nagios_server/files/nagios/services/hosted.cfg
+++ b/roles/nagios_server/files/nagios/services/hosted.cfg
@@ -1,57 +1,3 @@
-#define service {
-#  hostgroup             hosted
-#  service_description   BZR
-#  check_command         check_bzr
-#  use                   defaulttemplate
-#}
 #
-#define service {
-#  hostgroup             hosted
-#  service_description   GIT
-#  check_command         check_git
-#  use                   defaulttemplate
-#}
-
-#define service {
-#  hostgroup             hosted
-#  service_description   bzr.fedorahosted.org
-#  check_command         check_website!bzr.fedorahosted.org!/bzr/!loggerheadCont
-#  use                   websitetemplate
-#}
+# This file is dead.
 #
-#define service {
-#  hostgroup             hosted
-#  service_description   fedorahosted.org
-#  check_command         check_website!fedorahosted.org!/!
-#  use                   websitetemplate
-#}
-#
-#define service {
-#  hostgroup             hosted
-#  service_description   git.fedorahosted.org
-#  check_command         check_website!git.fedorahosted.org!/git/fedora-infrastructure.git/!<!-- git web interface version
-#  max_check_attempts    7
-#  use                   websitetemplate
-#}
-#
-#define service {
-#  hostgroup             hosted
-#  service_description   hg.fedorahosted.org
-#  check_command         check_website!hg.fedorahosted.org!/hg/!?sort=lastchange
-#  use                   websitetemplate
-#}
-#
-#define service {
-#  hostgroup             hosted
-#  service_description   svn.fedorahosted.org
-#  check_command         check_website!svn.fedorahosted.org!/svn/sos/!Subversion
-#  use                   websitetemplate
-#}
-#
-#define service {
-#  hostgroup             hosted
-#  service_description   Load Averages
-#  check_command         check_by_nrpe!check_hosted_load
-#  use                   defaulttemplate
-#}
-
diff --git a/roles/nagios_server/files/nagios/services/mail_queue.cfg b/roles/nagios_server/files/nagios/services/mail_queue.cfg
index 85f79f19b9..58e9c5750f 100644
--- a/roles/nagios_server/files/nagios/services/mail_queue.cfg
+++ b/roles/nagios_server/files/nagios/services/mail_queue.cfg
@@ -1,7 +1,7 @@
-#define service {
-#  hostgroup            nomail
-#  service_description   mail_queue
-#  check_command         check_by_nrpe!check_postfix_queue
-#  max_check_attempts    7
-#  use                   defaulttemplate
-#}
+define service {
+  hostgroup            nomail
+  service_description   mail_queue
+  check_command         check_by_nrpe!check_postfix_queue
+  max_check_attempts    7
+  use                   defaulttemplate
+}