diff --git a/inventory/host_vars/backup03.phx2.fedoraproject.org b/inventory/host_vars/backup03.phx2.fedoraproject.org
deleted file mode 100644
index c4dfce6cfc..0000000000
--- a/inventory/host_vars/backup03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-nrpe_procs_warn: 400
-nrpe_procs_crit: 500
-tcp_ports: ['9101', '9102', '9103']
diff --git a/inventory/host_vars/db-aarch64.qa.fedoraproject.org b/inventory/host_vars/db-aarch64.qa.fedoraproject.org
deleted file mode 100644
index 187eec761e..0000000000
--- a/inventory/host_vars/db-aarch64.qa.fedoraproject.org
+++ /dev/null
@@ -1,11 +0,0 @@
----
-nm: 255.255.255.0
-gw: 10.5.124.254
-dns: 10.5.126.21
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
-ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.148
-vmhost: virthost-comm02.qa.fedoraproject.org
-datacenter: phx2
-is_kojidb: True
diff --git a/inventory/host_vars/junk02.phx2.fedoraproject.org b/inventory/host_vars/junk02.phx2.fedoraproject.org
deleted file mode 100644
index ae84d4f76b..0000000000
--- a/inventory/host_vars/junk02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-datacenter: phx2
-nm: 255.255.255.0
-gw: 10.5.126.254
-fas_client_groups: sysadmin-main
-dns: 10.5.126.21
-eth0_ip: 10.5.126.8
-freezes: false
diff --git a/inventory/host_vars/mm3test.fedoraproject.org b/inventory/host_vars/mm3test.fedoraproject.org
deleted file mode 100644
index b4c8e03414..0000000000
--- a/inventory/host_vars/mm3test.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-freezes: false
-datacenter: ibiblio
diff --git a/inventory/host_vars/serverbeach06.fedoraproject.org b/inventory/host_vars/serverbeach06.fedoraproject.org
deleted file mode 100644
index 331d8c93a2..0000000000
--- a/inventory/host_vars/serverbeach06.fedoraproject.org
+++ /dev/null
@@ -1,5 +0,0 @@
----
-datacenter: serverbeach
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-postfix_group: vpn
diff --git a/inventory/host_vars/serverbeach07.fedoraproject.org b/inventory/host_vars/serverbeach07.fedoraproject.org
deleted file mode 100644
index 331d8c93a2..0000000000
--- a/inventory/host_vars/serverbeach07.fedoraproject.org
+++ /dev/null
@@ -1,5 +0,0 @@
----
-datacenter: serverbeach
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-postfix_group: vpn
diff --git a/inventory/host_vars/serverbeach08.fedoraproject.org b/inventory/host_vars/serverbeach08.fedoraproject.org
deleted file mode 100644
index 331d8c93a2..0000000000
--- a/inventory/host_vars/serverbeach08.fedoraproject.org
+++ /dev/null
@@ -1,5 +0,0 @@
----
-datacenter: serverbeach
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-postfix_group: vpn
diff --git a/inventory/host_vars/serverbeach09.fedoraproject.org b/inventory/host_vars/serverbeach09.fedoraproject.org
deleted file mode 100644
index 331d8c93a2..0000000000
--- a/inventory/host_vars/serverbeach09.fedoraproject.org
+++ /dev/null
@@ -1,5 +0,0 @@
----
-datacenter: serverbeach
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-postfix_group: vpn
diff --git a/inventory/host_vars/serverbeach10.fedoraproject.org b/inventory/host_vars/serverbeach10.fedoraproject.org
deleted file mode 100644
index 331d8c93a2..0000000000
--- a/inventory/host_vars/serverbeach10.fedoraproject.org
+++ /dev/null
@@ -1,5 +0,0 @@
----
-datacenter: serverbeach
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-postfix_group: vpn
diff --git a/inventory/host_vars/smtp_host_vars b/inventory/host_vars/smtp_host_vars
deleted file mode 100644
index a47f88f739..0000000000
--- a/inventory/host_vars/smtp_host_vars
+++ /dev/null
@@ -1,20 +0,0 @@
-# ---
-# nm: 255.255.255.128
-# gw: 152.19.134.129
-# dns: 152.2.21.1 152.2.253.100
-# ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6
-# ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/
-# volgroup: ????
-# eth0_ip: 152.19.134.143
-# vmhost: ibiblio03.fedoraproject.org
-# datacenter: ibiblio
----
-nm: 255.255.255.240
-gw: 66.35.62.174
-dns: 198.49.126.1 66.35.36.133
-ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6
-ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/
-volgroup: /dev/GuestVolGroup00
-eth0_ip: 66.35.62.164
-vmhost: tummy01.fedoraproject.org
-datacenter: tummy