diff --git a/DE-3/TP_Mobile_Send2VehicleMGU.yaml b/DE-3/TP_Mobile_Send2VehicleMGU.yaml
index 8dee496..cc84cca 100644
--- a/DE-3/TP_Mobile_Send2VehicleMGU.yaml
+++ b/DE-3/TP_Mobile_Send2VehicleMGU.yaml
@@ -16,12 +16,6 @@ slo_definition:
       keyRequests:
       - "/v2/motorist/[UUID]/trips"
       - "/v3/motorist/[UUID]/trips"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "TripService - PROD"
-      keyRequests:
-      - "/v2/motorist/[UUID]/trips"
-      - "/v3/motorist/[UUID]/trips"
   NA-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -29,12 +23,6 @@ slo_definition:
       keyRequests:
       - "/v2/motorist/[UUID]/trips"
       - "/v3/motorist/[UUID]/trips"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "TripService - PROD"
-      keyRequests:
-      - "/v2/motorist/[UUID]/trips"
-      - "/v3/motorist/[UUID]/trips"
   CN-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
diff --git a/convert.py b/convert.py
index ee8cdf6..a11d32c 100644
--- a/convert.py
+++ b/convert.py
@@ -14,15 +14,9 @@ OUTPUT_FOLDER_BASENAME = os.path.basename("output")
 TEMPLATE_FOLDER_BASENAME = os.path.basename("templates")
 TEMPLATE_FILES = {
     "terraform-template.j2":  ["builtin:service.keyRequest.errors.fivexx.rate"],
-    "terraform-template-2.j2":["builtin:service.keyRequest.errors.server.successCount",
-                               "builtin:service.keyRequest.count.server"],
-    "terraform-template-3.j2":["builtin:service.keyRequest.errors.fivexx.count",
-                               "builtin:service.keyRequest.count.server"],
-    "terraform-template-4.j2":["builtin:service.successes.server.rate"],
-    "terraform-template-5.j2":["calc:service.vehicleservice_oes_responsecode_998_requestcount",
-                               "calc:service.vehicleservice_oes_responsecode_999_requestcount",
-                               "calc:service.vehicleservice_oes_fivexx_count",
-                               "calc:service.vehicleservice_oes_request_count_total"]
+    "terraform-template-2.j2":["builtin:service.keyRequest.errors.server.successCount"],
+    "terraform-template-3.j2":["builtin:service.keyRequest.errors.fivexx.count"],
+    "terraform-template-4.j2":["builtin:service.successes.server.rate"]
 }
 FOLDERS = {"My Journey":"DE-3",
            "Connected Vehicle Platforms":"DE-7",
diff --git a/output/EMEA_Prod/slo/TP_Mobile_Send2VehicleMGU.tf b/output/EMEA_Prod/slo/TP_Mobile_Send2VehicleMGU.tf
index 1618c56..b552a76 100644
--- a/output/EMEA_Prod/slo/TP_Mobile_Send2VehicleMGU.tf
+++ b/output/EMEA_Prod/slo/TP_Mobile_Send2VehicleMGU.tf
@@ -84,7 +84,8 @@ module TP_Mobile_Send2VehicleMGU {
 				~"i~",
 				~"p~",
 				~"s~"
-                )"))))):splitBy())
+                )"))))
+                 ):splitBy())
 	/
 	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
         fromRelationship.isServiceMethodOfService(
diff --git a/templates/terraform-template-2.j2 b/templates/terraform-template-2.j2
index 1bc70f6..f38d9e1 100644
--- a/templates/terraform-template-2.j2
+++ b/templates/terraform-template-2.j2
@@ -11,22 +11,22 @@ module {{ module }} {
             
     # metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-    (100)*(({{ metricA }}:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+    (100)*(({{ metric }}:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
         fromRelationship.isServiceMethodOfService(
             type(~"SERVICE~"),entityName.in(
-                ~"{{ servicesA }}~"
+                ~"{{ services }}~"
                 )
             ),entityName.in(
-                ~"{{ keyRequestsA }}~"
+                ~"{{ keyRequests }}~"
                 )"))))):splitBy())
 	/
-	({{ metricB }}:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
         fromRelationship.isServiceMethodOfService(
             type(~"SERVICE~"),entityName.in(
-                ~"{{ servicesB }}~"
+                ~"{{ services }}~"
                 )
             ),entityName.in(
-                ~"{{ keyRequestsB }}~"
+                ~"{{ keyRequests }}~"
                 )"))))):splitBy()))
     EOT
  
diff --git a/templates/terraform-template-3.j2 b/templates/terraform-template-3.j2
index 62997f3..fa6f55a 100644
--- a/templates/terraform-template-3.j2
+++ b/templates/terraform-template-3.j2
@@ -11,22 +11,22 @@ module {{ module }} {
             
     # metric expression of the calculation as done in data explorer ui
     metric_expression           = <<EOT
-    (100)*((1)-({{ metricA }}:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+    (100)*((1)-({{ metric }}:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
         fromRelationship.isServiceMethodOfService(
             type(~"SERVICE~"),entityName.in(
-                ~"{{ servicesA }}~"
+                ~"{{ services }}~"
                 )
 			),entityName.in(
-				~"{{ keyRequestsA }}~"
+				~"{{ keyRequests }}~"
 			    )"))))):splitBy())
 	/
-    ({{ metricB }}:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+    (builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
         fromRelationship.isServiceMethodOfService(
             type(~"SERVICE~"),entityName.in(
-                ~"{{ servicesB }}~"
+                ~"{{ services }}~"
                 )
             ),entityName.in(
-                ~"{{ keyRequestsB }}~"
+                ~"{{ keyRequests }}~"
                 )"))))):splitBy()))
     EOT
  
diff --git a/templates/terraform-template-5.j2 b/templates/terraform-template-5.j2
deleted file mode 100644
index 72230c3..0000000
--- a/templates/terraform-template-5.j2
+++ /dev/null
@@ -1,33 +0,0 @@
-module {{ module }} {
-    
-    source                      = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    name                        = "{{ slo_name }}"
-
-    description                 = "{{ description }}"
-
-    # entity selector object
-    filter                      = ""
-
-    # metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<<EOT
-    (100)*((1)-((({{ metricA }}:filter(and(or(in("dt.entity.service",entitySelector("type(~"SERVICE~")"))))):splitBy():sum)
-    +
-    ({{ metricB }}:filter(and(or(in("dt.entity.service",entitySelector("type(~"SERVICE~")"))))):splitBy():sum)
-    +
-    ({{ metricC }}:filter(and(or(in("dt.entity.service",entitySelector("type(~"SERVICE~")"))))):splitBy():sum))
-    /
-    ({{ metricD }}:filter(and(or(in("dt.entity.service",entitySelector("type(~"SERVICE~")"))))):splitBy():sum)))
-    EOT
-
-    # if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d" 
-         
-    # currently the only possible value
-    evaluation                  = "AGGREGATE"           
-
-    # target and warning percentage of the SLO as double
-    target                      = {{ target }}              # if not set(removed) it's defaulted to 98
-    warning                     = {{ warning }}               # if not set(removed) it's defaulted to 99
-    
-}