diff --git a/TAF/testCaseModules/keywords/common/commonKeywords.robot b/TAF/testCaseModules/keywords/common/commonKeywords.robot
index 12daf0f2..6bdbbce2 100644
--- a/TAF/testCaseModules/keywords/common/commonKeywords.robot
+++ b/TAF/testCaseModules/keywords/common/commonKeywords.robot
@@ -236,12 +236,6 @@ Query Version
     ${resp}=  GET On Session  Version  api/${API_VERSION}/version  headers=${headers}  expected_status=200
     Set Response to Test Variables  ${resp}
 
-Query Metrics
-    ${headers}=  Create Dictionary  Authorization=Bearer ${jwt_token}
-    Create Session  Metrics  url=${url}  disable_warnings=true
-    ${resp}=  GET On Session  Metrics  api/${API_VERSION}/metrics  headers=${headers}  expected_status=200
-    Set Response to Test Variables  ${resp}
-
 Update Service Configuration On Consul
     [Arguments]  ${path}  ${value}
     ${consul_token}  Run Keyword If  $SECURITY_SERVICE_NEEDED == 'true'  Get Consul Token
diff --git a/TAF/testScenarios/functionalTest/V2-API/app-service/info/GET.robot b/TAF/testScenarios/functionalTest/V2-API/app-service/info/GET.robot
index 51b3c6b7..1b9504cc 100644
--- a/TAF/testScenarios/functionalTest/V2-API/app-service/info/GET.robot
+++ b/TAF/testScenarios/functionalTest/V2-API/app-service/info/GET.robot
@@ -24,13 +24,7 @@ InfoGET002 - Query version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 
-InfoGET003 - Query metrics
-    When Query Metrics
-    Then Should Return Status Code "200" And metrics
-    And apiVersion Should be ${API_VERSION}
-    And Response Time Should Be Less Than "${default_response_time_threshold}"ms
-
-InfoGET004 - Query config
+InfoGET003 - Query config
     When Query Config
     Then Should Return Status Code "200" And config
     And apiVersion Should be ${API_VERSION}
diff --git a/TAF/testScenarios/functionalTest/V2-API/core-command/info/GET.robot b/TAF/testScenarios/functionalTest/V2-API/core-command/info/GET.robot
index 0930aa86..070fa90d 100644
--- a/TAF/testScenarios/functionalTest/V2-API/core-command/info/GET.robot
+++ b/TAF/testScenarios/functionalTest/V2-API/core-command/info/GET.robot
@@ -25,13 +25,7 @@ InfoGET002 - Query version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 
-InfoGET003 - Query metrics
-    When Query Metrics
-    Then Should Return Status Code "200" And metrics
-    And apiVersion Should be ${API_VERSION}
-    And Response Time Should Be Less Than "${default_response_time_threshold}"ms
-
-InfoGET004 - Query config
+InfoGET003 - Query config
     When Query Config
     Then Should Return Status Code "200" And config
     And apiVersion Should be ${API_VERSION}
diff --git a/TAF/testScenarios/functionalTest/V2-API/core-data/info/GET.robot b/TAF/testScenarios/functionalTest/V2-API/core-data/info/GET.robot
index 357f237a..d299a97f 100644
--- a/TAF/testScenarios/functionalTest/V2-API/core-data/info/GET.robot
+++ b/TAF/testScenarios/functionalTest/V2-API/core-data/info/GET.robot
@@ -24,13 +24,7 @@ InfoGET002 - Query version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 
-InfoGET003 - Query metrics
-    When Query Metrics
-    Then Should Return Status Code "200" And metrics
-    And apiVersion Should be ${API_VERSION}
-    And Response Time Should Be Less Than "${default_response_time_threshold}"ms
-
-InfoGET004 - Query config
+InfoGET003 - Query config
     When Query Config
     Then Should Return Status Code "200" And config
     And apiVersion Should be ${API_VERSION}
diff --git a/TAF/testScenarios/functionalTest/V2-API/core-metadata/info/GET.robot b/TAF/testScenarios/functionalTest/V2-API/core-metadata/info/GET.robot
index 605da6aa..4d26fd84 100644
--- a/TAF/testScenarios/functionalTest/V2-API/core-metadata/info/GET.robot
+++ b/TAF/testScenarios/functionalTest/V2-API/core-metadata/info/GET.robot
@@ -24,19 +24,13 @@ InfoGET002 - Query version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 
-InfoGET003 - Query metrics
-    When Query Metrics
-    Then Should Return Status Code "200" And metrics
-    And apiVersion Should be ${API_VERSION}
-    And Response Time Should Be Less Than "${default_response_time_threshold}"ms
-
-InfoGET004 - Query config
+InfoGET003 - Query config
     When Query Config
     Then Should Return Status Code "200" And config
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 
-InfoGET005 - Query UoM
+InfoGET004 - Query UoM
     When Query UoM
     Then Should Return Status Code "200" And uom
     And apiVersion Should be ${API_VERSION}
diff --git a/TAF/testScenarios/functionalTest/V2-API/support-notifications/info/GET.robot b/TAF/testScenarios/functionalTest/V2-API/support-notifications/info/GET.robot
index 80e89186..a593f388 100644
--- a/TAF/testScenarios/functionalTest/V2-API/support-notifications/info/GET.robot
+++ b/TAF/testScenarios/functionalTest/V2-API/support-notifications/info/GET.robot
@@ -24,13 +24,7 @@ InfoGET002 - Query version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 
-InfoGET003 - Query metrics
-    When Query Metrics
-    Then Should Return Status Code "200" And metrics
-    And apiVersion Should be ${API_VERSION}
-    And Response Time Should Be Less Than "${default_response_time_threshold}"ms
-
-InfoGET004 - Query config
+InfoGET003 - Query config
     When Query Config
     Then Should Return Status Code "200" And config
     And apiVersion Should be ${API_VERSION}
diff --git a/TAF/testScenarios/functionalTest/V2-API/support-scheduler/info/GET.robot b/TAF/testScenarios/functionalTest/V2-API/support-scheduler/info/GET.robot
index 42ae1f85..a9858b8b 100644
--- a/TAF/testScenarios/functionalTest/V2-API/support-scheduler/info/GET.robot
+++ b/TAF/testScenarios/functionalTest/V2-API/support-scheduler/info/GET.robot
@@ -24,13 +24,7 @@ InfoGET002 - Query version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 
-InfoGET003 - Query metrics
-    When Query Metrics
-    Then Should Return Status Code "200" And metrics
-    And apiVersion Should be ${API_VERSION}
-    And Response Time Should Be Less Than "${default_response_time_threshold}"ms
-
-InfoGET004 - Query config
+InfoGET003 - Query config
     When Query Config
     Then Should Return Status Code "200" And config
     And apiVersion Should be ${API_VERSION}
diff --git a/TAF/testScenarios/functionalTest/device-service/common/info/GET.robot b/TAF/testScenarios/functionalTest/device-service/common/info/GET.robot
index bc2b9a45..f652dc58 100644
--- a/TAF/testScenarios/functionalTest/device-service/common/info/GET.robot
+++ b/TAF/testScenarios/functionalTest/device-service/common/info/GET.robot
@@ -23,13 +23,7 @@ InfoGET002 - Query version
     And apiVersion Should be ${API_VERSION}
     And Response Time Should Be Less Than "${default_response_time_threshold}"ms
 
-InfoGET003 - Query metrics
-    When Query Metrics
-    Then Should Return Status Code "200" And metrics
-    And apiVersion Should be ${API_VERSION}
-    And Response Time Should Be Less Than "${default_response_time_threshold}"ms
-
-InfoGET004 - Query config
+InfoGET003 - Query config
     When Query Config
     Then Should Return Status Code "200" And config
     And apiVersion Should be ${API_VERSION}