diff --git a/systemdfiles/consumer/mozdefmqwautoland.service b/systemdfiles/consumer/mozdefmqwautoland.service
deleted file mode 100644
index fe790f16..00000000
--- a/systemdfiles/consumer/mozdefmqwautoland.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwAutoland
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwAutoland
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqAutoland
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwAutoland.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwautoloand
diff --git a/systemdfiles/consumer/mozdefmqwbro.service b/systemdfiles/consumer/mozdefmqwbro.service
deleted file mode 100644
index 792afc8f..00000000
--- a/systemdfiles/consumer/mozdefmqwbro.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwBro
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwBro.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwbro
diff --git a/systemdfiles/consumer/mozdefmqwcloudtrailsqs.service b/systemdfiles/consumer/mozdefmqwcloudtrailsqs.service
deleted file mode 100644
index fb4597fb..00000000
--- a/systemdfiles/consumer/mozdefmqwcloudtrailsqs.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwcloudtrailsqs
-After=syslog.target
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwcloudtrail
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwcloudtrail
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwcloudtrail.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwcloudtrailsqs
diff --git a/systemdfiles/consumer/mozdefmqwcontegix-auditd.service b/systemdfiles/consumer/mozdefmqwcontegix-auditd.service
deleted file mode 100644
index fdccf33a..00000000
--- a/systemdfiles/consumer/mozdefmqwcontegix-auditd.service
+++ /dev/null
@@ -1,21 +0,0 @@
-Unit]
-Description=uWSGI mozdef mqwContegix-auditd
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwContegix-auditd
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwContegix-auditd
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwContegix-auditd.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwcontegix-auditd
diff --git a/systemdfiles/consumer/mozdefmqwcontegix.service b/systemdfiles/consumer/mozdefmqwcontegix.service
deleted file mode 100644
index 8e18e19f..00000000
--- a/systemdfiles/consumer/mozdefmqwcontegix.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwContegix
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwContegix
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwContegix
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwContegix.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwcontegix
diff --git a/systemdfiles/consumer/mozdefmqwfxa.service b/systemdfiles/consumer/mozdefmqwfxa.service
deleted file mode 100644
index dcc5eda5..00000000
--- a/systemdfiles/consumer/mozdefmqwfxa.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwFXA
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwFxa
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwFxa
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwFxa.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwfxa
diff --git a/systemdfiles/consumer/mozdefmqwinfosecsqs.service b/systemdfiles/consumer/mozdefmqwinfosecsqs.service
deleted file mode 100644
index 15d5510c..00000000
--- a/systemdfiles/consumer/mozdefmqwinfosecsqs.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwInfosecSQS
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwInfosecSQS
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwInfosecSQS
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwInfosecSQS.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwinfosecsqs
diff --git a/systemdfiles/consumer/mozdefmqwmigsqs.service b/systemdfiles/consumer/mozdefmqwmigsqs.service
deleted file mode 100644
index 1ca1f4a0..00000000
--- a/systemdfiles/consumer/mozdefmqwmigsqs.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwMIGSQS
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwMIGSQS
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwMIGSQS
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwMIGSQS.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwmigsqs
diff --git a/systemdfiles/consumer/mozdefmqwnubis.service b/systemdfiles/consumer/mozdefmqwnubis.service
deleted file mode 100644
index 5e52fe60..00000000
--- a/systemdfiles/consumer/mozdefmqwnubis.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwNubis
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwNubis
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwNubis
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwNubis.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwnubis
diff --git a/systemdfiles/consumer/mozdefmqwobservatorysqs.service b/systemdfiles/consumer/mozdefmqwobservatorysqs.service
deleted file mode 100644
index e2bb0ac9..00000000
--- a/systemdfiles/consumer/mozdefmqwobservatorysqs.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwObservatorySQS
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwObservatorySQS
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwObservatorySQS
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwObservatoryFluentd.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwobservatorysqs
diff --git a/systemdfiles/consumer/mozdefmqwparsyssqs.service b/systemdfiles/consumer/mozdefmqwparsyssqs.service
deleted file mode 100644
index f571a0a8..00000000
--- a/systemdfiles/consumer/mozdefmqwparsyssqs.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwParsysSQS
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwParsysSQS
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwParsysSQS
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwParsysSQS.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqparsyssqs
diff --git a/systemdfiles/consumer/mozdefmqwriskheatmapsqs.service b/systemdfiles/consumer/mozdefmqwriskheatmapsqs.service
deleted file mode 100644
index fe6bdc6a..00000000
--- a/systemdfiles/consumer/mozdefmqwriskheatmapsqs.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwRiskHeatMapSQS
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwRiskHeatMapSQS
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwRiskHeatMapSQS
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwRiskHeatMapFluentd.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwriskheatmapsqs
diff --git a/systemdfiles/consumer/mozdefmqwssosqs.service b/systemdfiles/consumer/mozdefmqwssosqs.service
deleted file mode 100644
index d43e0f01..00000000
--- a/systemdfiles/consumer/mozdefmqwssosqs.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwSSOSQS
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwSSOSQS
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwSSOSQS
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwSSOSQS.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwssosqs
diff --git a/systemdfiles/consumer/papertrail/mozdefmqwdeispapertrail.service b/systemdfiles/consumer/papertrail/mozdefmqwdeispapertrail.service
deleted file mode 100644
index 446c5221..00000000
--- a/systemdfiles/consumer/papertrail/mozdefmqwdeispapertrail.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwDeisPapertrail
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwDeisPapertrail
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwDeisPapertrail
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwDeisPapertrail.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwdeispapertrail
diff --git a/systemdfiles/consumer/papertrail/mozdefmqwrelengpapertrail.service b/systemdfiles/consumer/papertrail/mozdefmqwrelengpapertrail.service
deleted file mode 100644
index 7a145268..00000000
--- a/systemdfiles/consumer/papertrail/mozdefmqwrelengpapertrail.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=uWSGI mozdef mqwRelengPapertrail
-After=rabbitmq-server.service
-
-[Service]
-# Requires systemd version 211 or newer
-PermissionsStartOnly=true
-ExecStartPre=-/usr/bin/mkdir /var/run/mozdefmqwRelengPapertrail
-ExecStartPre=/usr/bin/chown -R mozdef:mozdef /var/run/mozdefmqwRelengPapertrail
-User=mozdef
-Group=mozdef
-ExecStart=/bin/bash -c 'cd /opt/mozdef/envs/mozdef/mq; source /opt/mozdef/envs/mozdef/bin/activate; uwsgi --ini mqwRelengPapertrail.ini'
-Restart=always
-KillSignal=SIGQUIT
-Type=notify
-StandardError=syslog
-NotifyAccess=all
-
-[Install]
-WantedBy=multi-user.target
-Alias=mqwrelengpapertrail