diff --git a/playbooks/tasks/web/nagios-ansible.cfg.j2 b/playbooks/tasks/web/nagios-ansible.cfg.j2
index 9c6a2e1..ec84707 100644
--- a/playbooks/tasks/web/nagios-ansible.cfg.j2
+++ b/playbooks/tasks/web/nagios-ansible.cfg.j2
@@ -50,11 +50,6 @@ define service {
 }
 
 # Commands
-define command {
-	# This command was manually added and should be present in all backups
-	command_name		check_snmp_storage_v3
-	command_line		/opt/Custom-Nagios-Plugins/check_snmp_storage.pl -H $HOSTADDRESS$ -l {{ secret_snmp_rouser_username }} -x {{ secret_snmp_rouser_password }} -X {{ secret_snmp_rouser_privacy_passphrase }} -L sha,aes -t 20 -m $ARG1$ -w $ARG2$ -c $ARG3$
-}
 define command {
 	# This command is included in the container image
 	command_name		check_nrpe
@@ -75,20 +70,6 @@ define service {
 	hostgroup_name		nagios-checkhttp
 }
 
-# Services for SNMP-capable hosts
-define service {
-	use			ansible-generic-service
-	service_description	Hostname
-	check_command		check_snmp!-P 3 -a SHA -x AES -o 1.3.6.1.2.1.1.1.0 -U {{ secret_snmp_rouser_username }} -A {{ secret_snmp_rouser_password }} -X {{ secret_snmp_rouser_privacy_passphrase }} -r $HOSTNAME$ -L authPriv
-	hostgroup_name		snmp
-}
-define service {
-	use			ansible-generic-service
-	service_description	Disk Usage
-	check_command		check_snmp_storage_v3!^/$!85!90
-	hostgroup_name		snmp
-}
-
 # Services for NRPE-capable hosts
 define service {
 	use			ansible-generic-service
@@ -115,6 +96,12 @@ define service {
 	hostgroup_name		nagios-nrpe
 }
 # Systemd unit checks
+define service {
+	use			ansible-generic-service
+	service_description	Unit ansible-pull.service
+	check_command		check_nrpe!check_systemd_ansiblepull_service
+	hostgroup_name		ansible-pull
+}
 define service {
 	use			ansible-generic-service
 	service_description	Unit backup.service
@@ -127,12 +114,6 @@ define service {
 	check_command		check_nrpe!check_systemd_backup_timer
 	hostgroup_name		nagios-nrpe
 }
-define service {
-	use			ansible-generic-service
-	service_description	Unit ansible-pull.service
-	check_command		check_nrpe!check_systemd_ansiblepull_service
-	hostgroup_name		ansible-pull
-}
 define service {
 	use			ansible-generic-service
 	service_description	Unit ansible-pull.timer