diff --git a/hiera/common.yaml b/hiera/common.yaml
index 4a93bc0fb6..98ee77316e 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -228,55 +228,7 @@ cacti_hosts:
 - afsdb02.openstack.org
 - apps.openstack.org
 - ask.openstack.org
-- baremetal00.hpuswest.ic.openstack.org
-- baremetal01.hpuswest.ic.openstack.org
 - ci-backup-rs-ord.openstack.org
-- compute000.hpuswest.ic.openstack.org
-- compute001.hpuswest.ic.openstack.org
-- compute002.hpuswest.ic.openstack.org
-- compute003.hpuswest.ic.openstack.org
-- compute004.hpuswest.ic.openstack.org
-- compute005.hpuswest.ic.openstack.org
-- compute006.hpuswest.ic.openstack.org
-- compute007.hpuswest.ic.openstack.org
-- compute008.hpuswest.ic.openstack.org
-- compute009.hpuswest.ic.openstack.org
-- compute010.hpuswest.ic.openstack.org
-- compute011.hpuswest.ic.openstack.org
-- compute012.hpuswest.ic.openstack.org
-- compute013.hpuswest.ic.openstack.org
-- compute014.hpuswest.ic.openstack.org
-- compute015.hpuswest.ic.openstack.org
-- compute016.hpuswest.ic.openstack.org
-- compute017.hpuswest.ic.openstack.org
-- compute018.hpuswest.ic.openstack.org
-- compute019.hpuswest.ic.openstack.org
-- compute020.hpuswest.ic.openstack.org
-- compute021.hpuswest.ic.openstack.org
-- compute022.hpuswest.ic.openstack.org
-- compute023.hpuswest.ic.openstack.org
-- compute024.hpuswest.ic.openstack.org
-- compute025.hpuswest.ic.openstack.org
-- compute026.hpuswest.ic.openstack.org
-- compute027.hpuswest.ic.openstack.org
-- compute028.hpuswest.ic.openstack.org
-- compute029.hpuswest.ic.openstack.org
-- compute030.hpuswest.ic.openstack.org
-- compute031.hpuswest.ic.openstack.org
-- compute032.hpuswest.ic.openstack.org
-- compute033.hpuswest.ic.openstack.org
-- compute034.hpuswest.ic.openstack.org
-- compute035.hpuswest.ic.openstack.org
-- compute036.hpuswest.ic.openstack.org
-- compute037.hpuswest.ic.openstack.org
-- compute038.hpuswest.ic.openstack.org
-- compute039.hpuswest.ic.openstack.org
-- compute040.hpuswest.ic.openstack.org
-- compute041.hpuswest.ic.openstack.org
-- compute042.hpuswest.ic.openstack.org
-- compute043.hpuswest.ic.openstack.org
-- controller00.hpuswest.ic.openstack.org
-- controller01.hpuswest.ic.openstack.org
 - eavesdrop.openstack.org
 - elasticsearch01.openstack.org
 - elasticsearch02.openstack.org