diff --git a/inventory/group_vars/taskotron-prod-clients b/inventory/group_vars/taskotron-prod-clients
deleted file mode 100644
index cab4fd02aa..0000000000
--- a/inventory/group_vars/taskotron-prod-clients
+++ /dev/null
@@ -1,52 +0,0 @@
----
-lvm_size: 60000
-mem_size: 8096
-num_cpus: 2
-
-############################################################
-# general config
-############################################################
-
-deployment_type: prod
-tcp_ports: [ "{{ buildslave_port }}" ]
-sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
-freezes: true
-
-
-############################################################
-# buildslave config
-############################################################
-
-slave_user: buildslave
-slave_home: /home/buildslave/
-slave_dir: /home/buildslave/slave
-buildmaster: 10.5.124.206
-buildslave_port: 9989
-taskotron_admin_email: taskotron-admin-members@fedoraproject.org
-
-
-############################################################
-# taskotron config
-############################################################
-
-taskotron_fas_user: taskotron
-taskotron_fas_password: '{{ prod_taskotron_fas_password}}'
-
-execdb_external_url: https://taskotron.fedoraproject.org/execdb/
-resultsdb_server: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v1.0/
-# this should be proxy01.phx2 through /etc/hosts
-bodhi_server: https://bodhi.fedoraproject.org/
-kojihub_url: http://koji.fedoraproject.org/kojihub
-taskotron_master: https://taskotron.fedoraproject.org/taskmaster/
-resultsdb_external_url: https://taskotron.fedoraproject.org/resultsdb
-artifacts_base_url: https://taskotron.fedoraproject.org/artifacts
-
-client_report_to_bodhi: 'True'
-
-############################################################
-# task git mirror config
-############################################################
-
-buildslave_private_sshkey_file: prod-buildslave-sshkey/prod_buildslave
-buildslave_public_sshkey_file: prod-buildslave-sshkey/prod_buildslave.pub
-buildmaster_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLIq4hjXt5WNPe6sNWz5bdQu9Oc7hMhi0aminK5DCNE9Ofz1pAKGalcw51NSOtCy8p0x8Mltdj7p453mEJlQx8Oktu87SgaGFfx3lLWXEpE9Z5EZxts43qYnzOk0qg0KbhhIMsyVl4mHmQcyB8SAtkPbzUv1ncWSpOUk5+beRUqmh34IutvqfOkAUnl1VCi2HbtNA3OMY3HmGNbSYTC+fwUA+jBZoVrmJn+ep41SmBLONz8NesVQKGx13VgvVwbf9D5BkeyRj5WtVNBRLHzawBP6hwagcIKWum8XIU4fkwhwd91kQ41Ccg3okBWxyNYv+9jy2lK13DjrCk/sBkkLJH'
diff --git a/inventory/host_vars/taskotron-client07.qa.fedoraproject.org b/inventory/host_vars/taskotron-client07.qa.fedoraproject.org
deleted file mode 100644
index 5840da4402..0000000000
--- a/inventory/host_vars/taskotron-client07.qa.fedoraproject.org
+++ /dev/null
@@ -1,14 +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-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.165
-vmhost: qa09.qa.fedoraproject.org
-datacenter: phx2
-
-short_hostname: taskotron-client07.qa
-buildslave_name: taskotron-client07
-fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/taskotron-client08.qa.fedoraproject.org b/inventory/host_vars/taskotron-client08.qa.fedoraproject.org
deleted file mode 100644
index fd87383d11..0000000000
--- a/inventory/host_vars/taskotron-client08.qa.fedoraproject.org
+++ /dev/null
@@ -1,14 +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-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.166
-vmhost: qa09.qa.fedoraproject.org
-datacenter: phx2
-
-short_hostname: taskotron-client08.qa
-buildslave_name: taskotron-client08
-fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/taskotron-client09.qa.fedoraproject.org b/inventory/host_vars/taskotron-client09.qa.fedoraproject.org
deleted file mode 100644
index 1c94eca9ef..0000000000
--- a/inventory/host_vars/taskotron-client09.qa.fedoraproject.org
+++ /dev/null
@@ -1,14 +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-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.167
-vmhost: qa09.qa.fedoraproject.org
-datacenter: phx2
-
-short_hostname: taskotron-client09.qa
-buildslave_name: taskotron-client09
-fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/taskotron-client10.qa.fedoraproject.org b/inventory/host_vars/taskotron-client10.qa.fedoraproject.org
deleted file mode 100644
index f2bfc1fc93..0000000000
--- a/inventory/host_vars/taskotron-client10.qa.fedoraproject.org
+++ /dev/null
@@ -1,14 +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-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.168
-vmhost: qa09.qa.fedoraproject.org
-datacenter: phx2
-
-short_hostname: taskotron-client10.qa
-buildslave_name: taskotron-client10
-fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/taskotron-client22.qa.fedoraproject.org b/inventory/host_vars/taskotron-client22.qa.fedoraproject.org
deleted file mode 100644
index 542642f08f..0000000000
--- a/inventory/host_vars/taskotron-client22.qa.fedoraproject.org
+++ /dev/null
@@ -1,14 +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-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.183
-vmhost: qa09.qa.fedoraproject.org
-datacenter: phx2
-
-short_hostname: taskotron-client22.qa
-buildslave_name: taskotron-client22
-fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/taskotron-client23.qa.fedoraproject.org b/inventory/host_vars/taskotron-client23.qa.fedoraproject.org
deleted file mode 100644
index 786c436374..0000000000
--- a/inventory/host_vars/taskotron-client23.qa.fedoraproject.org
+++ /dev/null
@@ -1,15 +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-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/i386/os/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.184
-vmhost: qa09.qa.fedoraproject.org
-datacenter: phx2
-libdir: /usr/lib
-
-short_hostname: taskotron-client23.qa
-buildslave_name: taskotron-client23
-fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/taskotron-client24.qa.fedoraproject.org b/inventory/host_vars/taskotron-client24.qa.fedoraproject.org
deleted file mode 100644
index e9cdbab966..0000000000
--- a/inventory/host_vars/taskotron-client24.qa.fedoraproject.org
+++ /dev/null
@@ -1,14 +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-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.185
-vmhost: qa09.qa.fedoraproject.org
-datacenter: phx2
-
-short_hostname: taskotron-client24.qa
-buildslave_name: taskotron-client24
-fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/host_vars/taskotron-client25.qa.fedoraproject.org b/inventory/host_vars/taskotron-client25.qa.fedoraproject.org
deleted file mode 100644
index fe455d13c1..0000000000
--- a/inventory/host_vars/taskotron-client25.qa.fedoraproject.org
+++ /dev/null
@@ -1,14 +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-fedora-22
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
-volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.186
-vmhost: qa09.qa.fedoraproject.org
-datacenter: phx2
-
-short_hostname: taskotron-client25.qa
-buildslave_name: taskotron-client25
-fas_client_groups: sysadmin-qa,sysadmin-main
diff --git a/inventory/inventory b/inventory/inventory
index 536ab9e948..231e44b46d 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -747,16 +747,6 @@ qa10.qa.fedoraproject.org
 [taskotron-prod]
 taskotron01.qa.fedoraproject.org
 
-[taskotron-prod-clients]
-taskotron-client07.qa.fedoraproject.org
-taskotron-client08.qa.fedoraproject.org
-taskotron-client09.qa.fedoraproject.org
-taskotron-client10.qa.fedoraproject.org
-taskotron-client22.qa.fedoraproject.org
-taskotron-client23.qa.fedoraproject.org
-taskotron-client24.qa.fedoraproject.org
-taskotron-client25.qa.fedoraproject.org
-
 [taskotron-prod-client-hosts]
 qa12.qa.fedoraproject.org
 qa13.qa.fedoraproject.org
@@ -1173,14 +1163,6 @@ qa13.qa.fedoraproject.org
 qa14.qa.fedoraproject.org
 taskotron-stg01.qa.fedoraproject.org
 taskotron01.qa.fedoraproject.org
-taskotron-client07.qa.fedoraproject.org
-taskotron-client08.qa.fedoraproject.org
-taskotron-client09.qa.fedoraproject.org
-taskotron-client10.qa.fedoraproject.org
-taskotron-client22.qa.fedoraproject.org
-taskotron-client23.qa.fedoraproject.org
-taskotron-client24.qa.fedoraproject.org
-taskotron-client25.qa.fedoraproject.org
 
 [osbs]
 osbs-master01.phx2.fedoraproject.org