diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml
index 126117901c..621dc9a1e4 100644
--- a/handlers/restart_services.yml
+++ b/handlers/restart_services.yml
@@ -164,9 +164,6 @@
   ignore_errors: true
   when: ansible_virtualization_role == 'host'
 
-- name: restart fcomm-cache-worker
-  service: name=fcomm-cache-worker state=restarted
-
 - name: restart haproxy
   service: name=haproxy state=restarted
 
diff --git a/playbooks/manual/rebuild/fedora-packages.yml b/playbooks/manual/rebuild/fedora-packages.yml
index 79f56ccb8f..b146fb6afe 100644
--- a/playbooks/manual/rebuild/fedora-packages.yml
+++ b/playbooks/manual/rebuild/fedora-packages.yml
@@ -31,7 +31,7 @@
     service: name={{item}} state=stopped
     with_items:
     - httpd
-    - fcomm-cache-worker
+    - fedmsg-hub
 
   - name: Nuke the old xapian search index
     file: path={{cache_root}}/packages/ state=absent
@@ -84,7 +84,7 @@
     service: name={{item}} state=started
     with_items:
     - httpd
-    - fcomm-cache-worker
+    - fedmsg-hub
 
   - name: tell nagios to start bothering us again
     nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}
diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 7e91323685..a45c231499 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -112,8 +112,6 @@
   - check_fedmsg_masher_proc.cfg
   - check_redis_proc.cfg
   - check_autocloud_proc.cfg
-  - check_fcomm_cache_worker_proc.cfg
-  - check_fcomm_queue.cfg
   - check_fedmsg_consumers.cfg
   - check_supybot_fedmsg_plugin.cfg
   - check_datanommer_history.cfg
diff --git a/roles/nagios_client/templates/check_fcomm_cache_worker_proc.cfg.j2 b/roles/nagios_client/templates/check_fcomm_cache_worker_proc.cfg.j2
deleted file mode 100644
index e0333880ab..0000000000
--- a/roles/nagios_client/templates/check_fcomm_cache_worker_proc.cfg.j2
+++ /dev/null
@@ -1 +0,0 @@
-command[check_fcomm_cache_worker_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fcomm-cache-wor' -u apache
diff --git a/roles/nagios_client/templates/check_fcomm_queue.cfg.j2 b/roles/nagios_client/templates/check_fcomm_queue.cfg.j2
deleted file mode 100644
index a12534b939..0000000000
--- a/roles/nagios_client/templates/check_fcomm_queue.cfg.j2
+++ /dev/null
@@ -1 +0,0 @@
-command[check_fcomm_queue]=/usr/lib64/nagios/plugins/check_fcomm_queue
diff --git a/roles/nagios_server/files/nagios/services/fedora-packages.cfg b/roles/nagios_server/files/nagios/services/fedora-packages.cfg
deleted file mode 100644
index d659e00906..0000000000
--- a/roles/nagios_server/files/nagios/services/fedora-packages.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-define service {
-  host_name             packages03
-  service_description   Check fcomm-cache-worker
-  check_command         check_by_nrpe!check_fcomm_cache_worker_proc
-  use                   defaulttemplate
-}
-define service {
-  host_name             packages03
-  service_description   Check redis
-  check_command         check_by_nrpe!check_redis_proc
-  use                   defaulttemplate
-}
-define service {
-  host_name             packages03
-  service_description   Check fcomm-queue
-  check_command         check_by_nrpe!check_fcomm_queue
-  use                   defaulttemplate
-}
-define service {
-  host_name             packages04
-  service_description   Check fcomm-cache-worker
-  check_command         check_by_nrpe!check_fcomm_cache_worker_proc
-  use                   defaulttemplate
-}
-define service {
-  host_name             packages04
-  service_description   Check redis
-  check_command         check_by_nrpe!check_redis_proc
-  use                   defaulttemplate
-}
-define service {
-  host_name             packages04
-  service_description   Check fcomm-queue
-  check_command         check_by_nrpe!check_fcomm_queue
-  use                   defaulttemplate
-}
diff --git a/roles/nagios_server/files/nrpe.cfg b/roles/nagios_server/files/nrpe.cfg
index 679b12dcd2..16b27365d5 100644
--- a/roles/nagios_server/files/nrpe.cfg
+++ b/roles/nagios_server/files/nrpe.cfg
@@ -234,8 +234,6 @@ command[check_fedmsg_tweet_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C
 command[check_fedmsg_masher_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fedmsg-hub' -u masher
 command[check_supybot_fedmsg_plugin]=/usr/lib64/nagios/plugins/check_supybot_plugin -t fedmsg
 command[check_haproxy_conns]=/usr/lib64/nagios/plugins/check_haproxy_conns.py
-command[check_fcomm_cache_worker_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'fcomm-cache-wor' -u apache
-command[check_fcomm_queue]=/usr/lib64/nagios/plugins/check_fcomm_queue
 command[check_redis_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'redis-server' -u redis
 command[check_autocloud_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'python' -a 'autocloud_job.py' -u root
 command[check_openvpn_link]=/usr/lib64/nagios/plugins/check_ping -H 192.168.1.41 -w 375.0,20% -c 500,60%