diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg
index e3f756a3de..443f8ce29e 100644
--- a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg
+++ b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-email.cfg
@@ -1,6 +1,6 @@
 define contactgroup{
         contactgroup_name       fedora-sysadmin-email
         alias                   Fedora Sysadmin Email Contacts
-# sysadmin-main: @ausil codeblock @kevin
-        members admin,codeblock,kevin
+# sysadmin-main: @ausil @kevin
+        members admin,kevin
         }
diff --git a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg
index 28fe3367d4..d3e0af7e7e 100644
--- a/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg
+++ b/roles/nagios_server/files/nagios/contactgroups/fedora-sysadmin-pager.cfg
@@ -1,11 +1,11 @@
 define contactgroup{
     contactgroup_name       fedora-sysadmin-pager
     alias                   Fedora Sysadmin Pager Contacts
-    members 		    kevinp,codeblockp
+    members 		    kevinp
 }
 
 define contactgroup{
     contactgroup_name       fedora-sysadmin-emergency
     alias                   Fedora Sysadmin Pager Contacts
-    members 		    kevin-emergency,codeblock-emergency
+    members 		    kevin-emergency
 }
diff --git a/roles/nagios_server/files/nagios/contacts/codeblock.cfg b/roles/nagios_server/files/nagios/contacts/codeblock.cfg
deleted file mode 100644
index e22c4b5b93..0000000000
--- a/roles/nagios_server/files/nagios/contacts/codeblock.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-# Already get emails from sysadmin-noc, so disable these, but define the user.
-define contact{
-	contact_name		codeblock
-	alias			Rick Elrod
-	service_notification_period     never
-	host_notification_period        never
-	service_notification_options    w,u,c,r
-	host_notification_options       d,u,r
-	service_notification_commands   notify-by-email
-	host_notification_commands      host-notify-by-email
-	email                           codeblock@elrod.me
-}
-
-define contact{
-    contact_name        codeblock-emergency
-    alias           Rick Elrod
-    service_notification_period     24x7
-    host_notification_period        24x7
-    service_notification_options    w,u,c,r
-    host_notification_options       d,u,r
-    service_notification_commands   notify-by-epager
-    host_notification_commands      host-notify-by-epager
-    pager               codeblock+urgent@elrod.me
-}
-
-define contact{
-    contact_name        codeblockp
-    alias           Rick Elrod
-    service_notification_period     12x7-USET
-    host_notification_period        12x7-USET
-    service_notification_options    w,u,c,r
-    host_notification_options       d,u,r
-    service_notification_commands   notify-by-epager
-    host_notification_commands      host-notify-by-epager
-    pager               codeblock+urgent@elrod.me
-}
diff --git a/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2 b/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2
index cb4489ff0b..424626dfdd 100644
--- a/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2
+++ b/roles/nagios_server/templates/nagios/configs/cgi.cfg.j2
@@ -143,7 +143,7 @@ authorized_for_configuration_information=*
 # authenticated to the web server.
 
 #authorized_for_system_commands=nagiosadmin
-authorized_for_system_commands=averi,codeblock,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch
+authorized_for_system_commands=averi,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch
 
 
 
@@ -173,9 +173,9 @@ authorized_for_all_hosts=*
 
 #authorized_for_all_service_commands=nagiosadmin
 #authorized_for_all_host_commands=nagiosadmin
-authorized_for_all_service_commands=averi,codeblock,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,cverna,clime,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,zlopez
+authorized_for_all_service_commands=averi,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,cverna,clime,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,zlopez
 
-authorized_for_all_host_commands=averi,codeblock,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,cverna,clime,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,zlopez
+authorized_for_all_host_commands=averi,kevin,nb,pfrields,puiterwijk,tibbs,pbrobinson,spot,pingou,tflink,mizdebsk,msimacek,stickster,bstinson,cverna,clime,mobrien,praiskup,frostyx,phsmoura,leo,abompard,ryanlerch,zlopez
 
 # STATUSMAP BACKGROUND IMAGE
 # This option allows you to specify an image to be used as a