diff --git a/src/telemetry/backend/service/TelemetryBackendService.py b/src/telemetry/backend/service/TelemetryBackendService.py
index bb9f0a3147f1d814a137d0b5338596fe8908d3d4..5276c2be37a2f5744db08b98f4b2b3b9151631b4 100755
--- a/src/telemetry/backend/service/TelemetryBackendService.py
+++ b/src/telemetry/backend/service/TelemetryBackendService.py
@@ -32,8 +32,6 @@ from common.tools.service.GenericGrpcService import GenericGrpcService
 
 LOGGER             = logging.getLogger(__name__)
 METRICS_POOL       = MetricsPool('TelemetryBackend', 'backendService')
-# EXPORTER_ENDPOINT  = "http://10.152.183.2:9100/metrics"
-
 
 class TelemetryBackendService(GenericGrpcService):
     """
diff --git a/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
index 2b872dba33bbe1434b68d5b5d2449e0b228312f7..b73d9fa952ee42aeb7adb8f3c0b2e4a3ba7f3e09 100644
--- a/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
+++ b/src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py
@@ -89,7 +89,14 @@ class TelemetryFrontendServiceServicerImpl(TelemetryFrontendServiceServicer):
                       request : CollectorId, grpc_context: grpc.ServicerContext # type: ignore
                      ) -> Empty:  # type: ignore
         LOGGER.info ("gRPC message: {:}".format(request))
-        self.PublishStopRequestOnKafka(request)
+        try:
+            collector_to_delete = request.collector_id.uuid
+            self.tele_db_obj.delete_db_row_by_id(
+                CollectorModel, "collector_id", collector_to_delete
+            )
+            self.PublishStopRequestOnKafka(request)
+        except Exception as e:
+            LOGGER.error('Unable to delete collector. Error: {:}'.format(e))
         return Empty()
 
     def PublishStopRequestOnKafka(self, collector_id):