diff --git a/interfaces/api/service/IClientContextManager.h b/interfaces/api/service/IClientContextManager.h
index e462f624..d0d413b7 100644
--- a/interfaces/api/service/IClientContextManager.h
+++ b/interfaces/api/service/IClientContextManager.h
@@ -140,8 +140,7 @@ static std::string toString(const TransformStatus transformStatus)
 ///
 enum class PipelineMode {
     RELOCALIZATION_AND_MAPPING = 0,         // Relocalization and mapping
-    RELOCALIZATION_AND_STEREO_MAPPING = 1,  // Relocalization and stereo mapping
-    RELOCALIZATION_ONLY = 2                 // Only relocalization
+    RELOCALIZATION_ONLY = 1                 // Only relocalization
 };
 
 /// @brief Return the text definition (string) of a PipelineMode object
@@ -155,9 +154,6 @@ static std::string toString(const PipelineMode pipelineMode)
         case PipelineMode::RELOCALIZATION_AND_MAPPING:
             textDefinition = "RELOCALIZATION_AND_MAPPING";
             break;
-        case PipelineMode::RELOCALIZATION_AND_STEREO_MAPPING:
-            textDefinition = "RELOCALIZATION_AND_STEREO_MAPPING";
-            break;
         case PipelineMode::RELOCALIZATION_ONLY:
             textDefinition = "RELOCALIZATION_ONLY";
             break;
@@ -231,7 +227,9 @@ class XPCF_CLIENTUUID("b675a1c5-078e-4c7a-82f7-d75a7d3d6dbe") XPCF_SERVERUUID("4
 
     /// @brief Unregister a client using its UUID
     /// @param[in] clientUUID the UUID of the client to unregister
-    /// @return FrameworkReturnCode::_SUCCESS if the client is unregistered, else FrameworkReturnCode::_ERROR_
+    /// @return
+    /// * FrameworkReturnCode::_UNKNOWN_CLIENT_UUID if the client UUID is not currently registered
+    /// * else FrameworkReturnCode::_SUCCESS (client unregistered)
     virtual FrameworkReturnCode unregisterClient(const std::string & clientUUID) = 0;
 
     /// @brief Return all current clients UUID
diff --git a/interfaces/api/service/IServiceManager.h b/interfaces/api/service/IServiceManager.h
index a686f0b5..95132a9f 100644
--- a/interfaces/api/service/IServiceManager.h
+++ b/interfaces/api/service/IServiceManager.h
@@ -35,9 +35,8 @@ enum class ServiceType {
     RELOCALIZATION_SERVICE = 1,
     RELOCALIZATION_MARKERS_SERVICE = 2,
     MAPPING_SERVICE = 3,
-    MAPPING_STEREO_SERVICE = 4,
-    MAP_PROCESSING_SFM_SERVICE = 5,
-    MAP_PROCESSING_DENSE_MAPPING_SERVICE = 6
+    MAP_PROCESSING_SFM_SERVICE = 4,
+    MAP_PROCESSING_DENSE_MAPPING_SERVICE = 5
 };
 
 /// @brief Return the name (string) of a service according to its type
@@ -60,9 +59,6 @@ static std::string getServiceName(const ServiceType serviceType)
     case ServiceType::MAPPING_SERVICE:
         serviceName = "Mapping Service";
         break;
-    case ServiceType::MAPPING_STEREO_SERVICE:
-        serviceName = "Stereo Mapping Service";
-        break;
     case ServiceType::MAP_PROCESSING_SFM_SERVICE:
         serviceName = "Map Processing Structure From Motion Service";
         break;