diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index b0fc314ef4..2f22db54bb 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -62,17 +62,6 @@ phx2_management_hosts:
   - dell-fx02-08.mgmt.fedoraproject.org
   - dell-fx02.mgmt.fedoraproject.org
   - cloud-fx01.mgmt.fedoraproject.org
-  - control01.mgmt.fedoraproject.org
-  - control02.mgmt.fedoraproject.org
-  - control03.mgmt.fedoraproject.org
-  - cn-x86-64-01-03.mgmt.fedoraproject.org
-  - cn-x86-64-01-04.mgmt.fedoraproject.org
-  - cn-x86-64-01-05.mgmt.fedoraproject.org
-  - cn-x86-64-01-06.mgmt.fedoraproject.org
-  - cn-x86-64-01-07.mgmt.fedoraproject.org
-  - cn-x86-64-01-08.mgmt.fedoraproject.org
-  - cn-x86-64-02-01.mgmt.fedoraproject.org
-  - cn-x86-64-02-02.mgmt.fedoraproject.org
   - cloud-fx02.mgmt.fedoraproject.org
   - download03.mgmt.fedoraproject.org
   - download04.mgmt.fedoraproject.org
diff --git a/inventory/hardware b/inventory/hardware
index 9b0e8415a3..2249671b20 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -69,23 +69,6 @@ qa11.qa.fedoraproject.org
 qa12.qa.fedoraproject.org
 qa13.qa.fedoraproject.org
 qa14.qa.fedoraproject.org
-#control01.cloud.fedoraproject.org
-#control02.cloud.fedoraproject.org
-#control03.cloud.fedoraproject.org
-#cn-x86-64-01-03.cloud.fedoraproject.org
-#cn-x86-64-01-04.cloud.fedoraproject.org
-#cn-x86-64-01-05.cloud.fedoraproject.org
-#cn-x86-64-01-06.cloud.fedoraproject.org
-#cn-x86-64-01-07.cloud.fedoraproject.org
-#cn-x86-64-01-08.cloud.fedoraproject.org
-#cn-x86-64-02-01.cloud.fedoraproject.org
-#cn-x86-64-02-02.cloud.fedoraproject.org
-#cn-x86-64-02-03.cloud.fedoraproject.org -- this is used as control03
-#cn-x86-64-02-04.cloud.fedoraproject.org
-#cn-x86-64-02-05.cloud.fedoraproject.org
-#cn-x86-64-02-06.cloud.fedoraproject.org
-#cn-x86-64-02-07.cloud.fedoraproject.org
-#cn-x86-64-02-08.cloud.fedoraproject.org
 bkernel03.phx2.fedoraproject.org
 bkernel04.phx2.fedoraproject.org
 
diff --git a/inventory/inventory b/inventory/inventory
index 06f1b4b01d..ade19d08fd 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1076,38 +1076,6 @@ fed-cloud-ppc02.cloud.fedoraproject.org
 [newcloud-undercloud]
 undercloud01.cloud.fedoraproject.org
 
-#[newcloud:children]
-#newcloud-control
-#newcloud-compute
-#
-#[newcloud-control]
-#control01.cloud.fedoraproject.org
-#control02.cloud.fedoraproject.org
-#control03.cloud.fedoraproject.org
-#
-#[newcloud-compute]
-## This is the first dell fx chassis with 8 carts
-## 01 is control01.cloud.fedoraproject.org
-## 02 is control02.cloud.fedoraproject.org
-#cn-x86-64-01-03.cloud.fedoraproject.org
-#cn-x86-64-01-04.cloud.fedoraproject.org
-#cn-x86-64-01-05.cloud.fedoraproject.org
-#cn-x86-64-01-06.cloud.fedoraproject.org
-#cn-x86-64-01-07.cloud.fedoraproject.org
-#cn-x86-64-01-08.cloud.fedoraproject.org
-## This is the second dell fx chassis with 8 carts
-#cn-x86-64-02-01.cloud.fedoraproject.org
-#cn-x86-64-02-02.cloud.fedoraproject.org
-##cn-x86-64-02-03.cloud.fedoraproject.org -- this is used as control03
-## The following slots are not yet populated.
-##cn-x86-64-02-04.cloud.fedoraproject.org
-##cn-x86-64-02-05.cloud.fedoraproject.org
-##cn-x86-64-02-06.cloud.fedoraproject.org
-##cn-x86-64-02-07.cloud.fedoraproject.org
-##cn-x86-64-02-08.cloud.fedoraproject.org
-#cn-aarch64-01.cloud.fedoraproject.org
-#cn-aarch64-02.cloud.fedoraproject.org
-
 [pdc-web]
 pdc-web01.phx2.fedoraproject.org
 pdc-web02.phx2.fedoraproject.org