diff --git a/CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf b/CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
index 80ddb87..40bb055 100644
--- a/CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/CN_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -21,55 +21,6 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
-
-  // compass product: Connected Security Services
-  // compass sub product: Vehicle Software Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
-  }
-  // for wrongly tagged services we still keep:
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Smart Access
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  // others that don't exist in compass, should be removed
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Key Management Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  // others that don't exist in compass, should be removed
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFPH\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Feature Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
diff --git a/CN_PREPROD/PD_management_zone/PD_CallServices.tf b/CN_PREPROD/PD_management_zone/PD_CallServices.tf
index 66cc33c..24553a9 100644
--- a/CN_PREPROD/PD_management_zone/PD_CallServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_CallServices.tf
@@ -34,22 +34,6 @@ resource "dynatrace_management_zone" "PD_CallServices" {
     selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
   }
 
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed from here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
-  }
-
-  // compass product: Conversation Services 
-  // compass sub product: Speech
-  // should be moved to a new management zone PD_ConversationServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
diff --git a/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index e85579c..779eb4a 100644
--- a/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/CN_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -59,12 +59,4 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
 
-  // compass product: Infotainment & Interactivity Services China
-  // no sub product
-  // moved to new management zone PD_InfotainmentInteractivityServicesChina
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
-
 }
diff --git a/CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index d7c3a7b..e9be4ca 100644
--- a/CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/CN_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -38,16 +38,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
-
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SRManager\")" 
diff --git a/CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 4fd94f6..6a48ec5 100644
--- a/CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/CN_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -27,13 +27,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
-  // compass product: Vehicle Device Mgmt.
-  // compass sub product: Provisioning Services
-  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
-  }
 
   // compass sub product: Vehicle Data Connect SP2018  
   entity_selector_based_rule {
diff --git a/CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf b/CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
index 80ddb87..40bb055 100644
--- a/CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/CN_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -21,55 +21,6 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
-
-  // compass product: Connected Security Services
-  // compass sub product: Vehicle Software Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
-  }
-  // for wrongly tagged services we still keep:
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Smart Access
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  // others that don't exist in compass, should be removed
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Key Management Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  // others that don't exist in compass, should be removed
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFPH\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Feature Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
diff --git a/CN_PROD/PD_management_zone/PD_CallServices.tf b/CN_PROD/PD_management_zone/PD_CallServices.tf
index 66cc33c..24553a9 100644
--- a/CN_PROD/PD_management_zone/PD_CallServices.tf
+++ b/CN_PROD/PD_management_zone/PD_CallServices.tf
@@ -34,22 +34,6 @@ resource "dynatrace_management_zone" "PD_CallServices" {
     selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
   }
 
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed from here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
-  }
-
-  // compass product: Conversation Services 
-  // compass sub product: Speech
-  // should be moved to a new management zone PD_ConversationServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
diff --git a/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index e85579c..779eb4a 100644
--- a/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/CN_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -59,12 +59,4 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
 
-  // compass product: Infotainment & Interactivity Services China
-  // no sub product
-  // moved to new management zone PD_InfotainmentInteractivityServicesChina
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
-
 }
diff --git a/CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index d7c3a7b..e9be4ca 100644
--- a/CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/CN_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -38,16 +38,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
-
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SRManager\")" 
diff --git a/CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 4fd94f6..6a48ec5 100644
--- a/CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/CN_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -27,13 +27,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
-  // compass product: Vehicle Device Mgmt.
-  // compass sub product: Provisioning Services
-  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
-  }
 
   // compass sub product: Vehicle Data Connect SP2018  
   entity_selector_based_rule {
diff --git a/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf b/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
index 80ddb87..40bb055 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -21,55 +21,6 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
-
-  // compass product: Connected Security Services
-  // compass sub product: Vehicle Software Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
-  }
-  // for wrongly tagged services we still keep:
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Smart Access
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  // others that don't exist in compass, should be removed
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Key Management Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  // others that don't exist in compass, should be removed
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFPH\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Feature Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
diff --git a/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf b/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
index 66cc33c..24553a9 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_CallServices.tf
@@ -34,22 +34,6 @@ resource "dynatrace_management_zone" "PD_CallServices" {
     selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
   }
 
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed from here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
-  }
-
-  // compass product: Conversation Services 
-  // compass sub product: Speech
-  // should be moved to a new management zone PD_ConversationServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
diff --git a/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index e85579c..779eb4a 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -59,12 +59,4 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
 
-  // compass product: Infotainment & Interactivity Services China
-  // no sub product
-  // moved to new management zone PD_InfotainmentInteractivityServicesChina
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
-
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index d7c3a7b..e9be4ca 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -38,16 +38,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
-
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SRManager\")" 
diff --git a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 4fd94f6..6a48ec5 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -27,13 +27,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
-  // compass product: Vehicle Device Mgmt.
-  // compass sub product: Provisioning Services
-  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
-  }
 
   // compass sub product: Vehicle Data Connect SP2018  
   entity_selector_based_rule {
diff --git a/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf b/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
index 80ddb87..40bb055 100644
--- a/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/EMEA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -21,55 +21,6 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
-
-  // compass product: Connected Security Services
-  // compass sub product: Vehicle Software Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
-  }
-  // for wrongly tagged services we still keep:
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Smart Access
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  // others that don't exist in compass, should be removed
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Key Management Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  // others that don't exist in compass, should be removed
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFPH\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Feature Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
diff --git a/EMEA_PROD/PD_management_zone/PD_CallServices.tf b/EMEA_PROD/PD_management_zone/PD_CallServices.tf
index 66cc33c..24553a9 100644
--- a/EMEA_PROD/PD_management_zone/PD_CallServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_CallServices.tf
@@ -34,22 +34,6 @@ resource "dynatrace_management_zone" "PD_CallServices" {
     selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
   }
 
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed from here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
-  }
-
-  // compass product: Conversation Services 
-  // compass sub product: Speech
-  // should be moved to a new management zone PD_ConversationServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
diff --git a/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index e85579c..779eb4a 100644
--- a/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/EMEA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -59,12 +59,4 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
 
-  // compass product: Infotainment & Interactivity Services China
-  // no sub product
-  // moved to new management zone PD_InfotainmentInteractivityServicesChina
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
-
 }
diff --git a/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index d7c3a7b..e9be4ca 100644
--- a/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -38,16 +38,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
-
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SRManager\")" 
diff --git a/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 4fd94f6..6a48ec5 100644
--- a/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/EMEA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -27,13 +27,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
-  // compass product: Vehicle Device Mgmt.
-  // compass sub product: Provisioning Services
-  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
-  }
 
   // compass sub product: Vehicle Data Connect SP2018  
   entity_selector_based_rule {
diff --git a/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf b/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
index 80ddb87..40bb055 100644
--- a/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/NA_PREPROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -21,55 +21,6 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
-
-  // compass product: Connected Security Services
-  // compass sub product: Vehicle Software Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
-  }
-  // for wrongly tagged services we still keep:
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Smart Access
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  // others that don't exist in compass, should be removed
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Key Management Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  // others that don't exist in compass, should be removed
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFPH\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Feature Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
diff --git a/NA_PREPROD/PD_management_zone/PD_CallServices.tf b/NA_PREPROD/PD_management_zone/PD_CallServices.tf
index 66cc33c..24553a9 100644
--- a/NA_PREPROD/PD_management_zone/PD_CallServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_CallServices.tf
@@ -34,22 +34,6 @@ resource "dynatrace_management_zone" "PD_CallServices" {
     selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
   }
 
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed from here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
-  }
-
-  // compass product: Conversation Services 
-  // compass sub product: Speech
-  // should be moved to a new management zone PD_ConversationServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
diff --git a/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index e85579c..779eb4a 100644
--- a/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/NA_PREPROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -59,12 +59,4 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
 
-  // compass product: Infotainment & Interactivity Services China
-  // no sub product
-  // moved to new management zone PD_InfotainmentInteractivityServicesChina
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
-
 }
diff --git a/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index d7c3a7b..e9be4ca 100644
--- a/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -38,16 +38,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
-
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SRManager\")" 
diff --git a/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 4fd94f6..6a48ec5 100644
--- a/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/NA_PREPROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -27,13 +27,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
-  // compass product: Vehicle Device Mgmt.
-  // compass sub product: Provisioning Services
-  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
-  }
 
   // compass sub product: Vehicle Data Connect SP2018  
   entity_selector_based_rule {
diff --git a/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf b/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
index 80ddb87..40bb055 100644
--- a/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
+++ b/NA_PROD/PD_management_zone/PD_AutomotiveSecurity.tf
@@ -21,55 +21,6 @@ resource "dynatrace_management_zone" "PD_AutomotiveSecurity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ASBC-NGTP\")" 
   }
-
-  // compass product: Connected Security Services
-  // compass sub product: Vehicle Software Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-RSU\",\"compass-id:ASBC-SBB\",\"compass-id:asbcswlsec2\",\"compass-id:psdzchecker\",\"compass-id:SCB\",\"compass-id:SCC\",\"compass-id:SWAG\",\"compass-id:swlsec2checker\")" 
-  }
-  // for wrongly tagged services we still keep:
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBCSWLSEC2\",\"compass-id:PSdZ-Checker\",\"compass-id:SWLSEC2-Checker\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Smart Access
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-SMACC\",\"compass-id:CAC\",\"compass-id:SMC2-BL\",\"compass-id:SMC2-KEY-TRK\",\"compass-id:SMC2-RT\")" 
-  }
-  // others that don't exist in compass, should be removed
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:CAC-AGENT\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Key Management Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFP\",\"compass-id:OCLISc2v\",\"compass-id:OCLISocsp\",\"compass-id:P2X\")" 
-  }
-  // others that don't exist in compass, should be removed
-    entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:DFPH\")" 
-  }
-
-  // compass product: Connected Security Services
-  // compass sub product: Feature Security Services
-  // should be moved to a new management zone PD_ConnectedSecurityServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:ASBC-FSC-AST\",\"compass-id:ASBC-MFSCS\",\"compass-id:STM\",\"compass-id:TVP\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:ts-wlupdater\",\"compass-id:ASBC-AFW-POC\",\"compass-id:ASBC-AFWSFA-POC\",\"compass-id:ASBC-AFWSTM-POC\")" 
diff --git a/NA_PROD/PD_management_zone/PD_CallServices.tf b/NA_PROD/PD_management_zone/PD_CallServices.tf
index 66cc33c..24553a9 100644
--- a/NA_PROD/PD_management_zone/PD_CallServices.tf
+++ b/NA_PROD/PD_management_zone/PD_CallServices.tf
@@ -34,22 +34,6 @@ resource "dynatrace_management_zone" "PD_CallServices" {
     selector = "type(Service),tag(\"compass-id:B2V-Voice\",\"compass-id:CRS\",\"compass-id:CRSA\",\"compass-id:EPL\",\"compass-id:EPM\",\"compass-id:epm-js-app\",\"compass-id:VOICEGW\",\"compass-id:VOICEGW-ADMIN\")" 
   }
 
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed from here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:PiSA-CORE\",\"compass-id:PISA-EVENT-HANDLER\",\"compass-id:PISA-RUNTIME\")" 
-  }
-
-  // compass product: Conversation Services 
-  // compass sub product: Speech
-  // should be moved to a new management zone PD_ConversationServices
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:HTTS\",\"compass-id:HVD\")" 
-  }
-
   // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
diff --git a/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf b/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
index e85579c..779eb4a 100644
--- a/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
+++ b/NA_PROD/PD_management_zone/PD_InfotainmentInteractivityServices.tf
@@ -59,12 +59,4 @@ resource "dynatrace_management_zone" "PD_InfotainmentInteractivityServices" {
     selector = "type(Service),tag(\"compass-id:CDIP\")" 
   }
 
-  // compass product: Infotainment & Interactivity Services China
-  // no sub product
-  // moved to new management zone PD_InfotainmentInteractivityServicesChina
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:iisc-ds\",\"compass-id:iisc-ir\",\"compass-id:iisc-ls\",\"compass-id:iisc-rr\",\"compass-id:iisc-tmpp-au\",\"compass-id:iisc-tmpp-mf\",\"compass-id:iisc-tmpp-wp\",\"compass-id:tmpp-wechat-proxy\")" 
-  }
-
 }
diff --git a/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index d7c3a7b..e9be4ca 100644
--- a/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -38,16 +38,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:LSCJHWO\",\"compass-id:tripCollection\",\"compass-id:VHCJR\",\"compass-id:VJDS\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
   }
-
-  // compass product: Vehicle Demand Identification and Lead Management
-  // compass sub product: Service Partner Management
-  // moved to PD_Teleservices, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:TOL\",\"compass-id:TOL MGU\",\"compass-id:TOL-TSSB\")" 
-  }
-
-  // others that don't exist in compass, should be removed
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:SRManager\")" 
diff --git a/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf b/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
index 4fd94f6..6a48ec5 100644
--- a/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
+++ b/NA_PROD/PD_management_zone/PD_VehicleDataConnectivity.tf
@@ -27,13 +27,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataConnectivity" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:B2V-COM-BE\")" 
   }
-  // compass product: Vehicle Device Mgmt.
-  // compass sub product: Provisioning Services
-  // moved to management zone PD_RemoteVehicleConfigurationManagement, should be removed here
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:B2V-NOTS\")" 
-  }
 
   // compass sub product: Vehicle Data Connect SP2018  
   entity_selector_based_rule {