diff --git a/environments/disable-telemetry.yaml b/environments/disable-telemetry.yaml
deleted file mode 100644
index 05398cab50..0000000000
--- a/environments/disable-telemetry.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# This heat environment can be used to disable all of the telemetry services.
-# It is most useful in a resource constrained environment or one in which
-# telemetry is not needed.
-
-resource_registry:
-  OS::TripleO::Services::CeilometerAgentCentral: OS::Heat::None
-  OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
-  OS::TripleO::Services::CeilometerAgentIpmi: OS::Heat::None
-  OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
-  OS::TripleO::Services::GnocchiApi: OS::Heat::None
-  OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
-  OS::TripleO::Services::GnocchiStatsd: OS::Heat::None
-  OS::TripleO::Services::AodhApi: OS::Heat::None
-  OS::TripleO::Services::AodhEvaluator: OS::Heat::None
-  OS::TripleO::Services::AodhNotifier: OS::Heat::None
-  OS::TripleO::Services::AodhListener: OS::Heat::None
-  OS::TripleO::Services::Redis: OS::Heat::None
-
-parameter_defaults:
-  NotificationDriver: 'noop'
-  GnocchiRbdPoolName: ''
diff --git a/environments/services/undercloud-aodh.yaml b/environments/services/undercloud-aodh.yaml
deleted file mode 100644
index 336c1456bf..0000000000
--- a/environments/services/undercloud-aodh.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# DEPRECATED. This file will be removed in the Train release as it is no longer
-# needed
-resource_registry:
-  OS::TripleO::Services::AodhApi: ../../deployment/aodh/aodh-api-container-puppet.yaml
-  OS::TripleO::Services::AodhEvaluator: ../../deployment/aodh/aodh-evaluator-container-puppet.yaml
-  OS::TripleO::Services::AodhNotifier: ../../deployment/aodh/aodh-notifier-container-puppet.yaml
-  OS::TripleO::Services::AodhListener: ../../deployment/aodh/aodh-listener-container-puppet.yaml
diff --git a/environments/services/undercloud-ceilometer.yaml b/environments/services/undercloud-ceilometer.yaml
deleted file mode 100644
index 01c9930a14..0000000000
--- a/environments/services/undercloud-ceilometer.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# DEPRECATED. This file will be removed in the Stein release as it is no longer
-# needed
-resource_registry:
-  OS::TripleO::Services::CeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
-  OS::TripleO::Services::CeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
-  OS::TripleO::Services::CeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
-
-parameter_defaults:
-  NotificationDriver: 'messagingv2'
diff --git a/environments/services/undercloud-gnocchi.yaml b/environments/services/undercloud-gnocchi.yaml
deleted file mode 100644
index 5e71e4fe74..0000000000
--- a/environments/services/undercloud-gnocchi.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# DEPRECATED. This file will be removed in the Stein release as it is no longer
-# needed
-resource_registry:
-  OS::TripleO::Services::GnocchiApi: ../../deployment/gnocchi/gnocchi-api-container-puppet.yaml
-  OS::TripleO::Services::GnocchiMetricd: ../../deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
-  OS::TripleO::Services::GnocchiStatsd: ../../deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
-  OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml