diff --git a/src/service/service/ServiceServiceServicerImpl.py b/src/service/service/ServiceServiceServicerImpl.py
index fe6bc74aac4dc67e0af4c7bea94936d9a590a4b0..bb8dfe3f756d7ea1bb53f22671aa2cb58b1f907c 100644
--- a/src/service/service/ServiceServiceServicerImpl.py
+++ b/src/service/service/ServiceServiceServicerImpl.py
@@ -269,15 +269,12 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
             device_names : Dict[str, str] = dict()
             for device in devices:
                 device_uuid = device.device_id.device_uuid.uuid
-                device_names[device_uuid] = device.name
-
-            LOGGER.warning('device_names={:s}'.format(str(device_names)))
-            LOGGER.warning('service={:s}'.format(grpc_message_to_json_string(service)))
+                device_names[device_uuid] = device.name # ID => name
+                device_names[device.name] = device.name # name => name (that way, if not present, crash)
 
             devs = []
             ports = []
             for endpoint_id in service.service_endpoint_ids:
-                LOGGER.warning('endpoint_id={:s}'.format(grpc_message_to_json_string(endpoint_id)))
                 endpoint_device_uuid = endpoint_id.device_id.device_uuid.uuid
                 endpoint_device_name = device_names[endpoint_device_uuid]
                 devs.append(endpoint_device_name)