diff --git a/inc/Helpers/AllMessageTypes.hpp b/inc/Helpers/AllMessageTypes.hpp
index 760800565d653e2cc60470b1119889307fa496f2..136a6447fd9146b510b9d139cf3ffca1cbe5387a 100644
--- a/inc/Helpers/AllMessageTypes.hpp
+++ b/inc/Helpers/AllMessageTypes.hpp
@@ -15,7 +15,6 @@
 
 /**
  * Namespace containing all the message types for every service type.
- * todo: needs to be updated after the implementation of the remaining ecss services.
  */
 namespace AllMessageTypes {
 	extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st01Messages;
diff --git a/src/Services/RealTimeForwardingControlService.cpp b/src/Services/RealTimeForwardingControlService.cpp
index 1cb6ee935f2921bdee46177545128621e54fc857..73ef3a4e8e25b8142b09286f3114f0130b9694e6 100644
--- a/src/Services/RealTimeForwardingControlService.cpp
+++ b/src/Services/RealTimeForwardingControlService.cpp
@@ -134,7 +134,6 @@ void RealTimeForwardingControlService::addReportTypesToAppProcessConfiguration(M
 		}
 
 		for (uint8_t j = 0; j < numOfServices; j++) {
-			// todo: check if service type is valid.
 			uint8_t serviceType = request.readUint8();
 			uint8_t numOfMessages = request.readUint8();
 
@@ -153,7 +152,6 @@ void RealTimeForwardingControlService::addReportTypesToAppProcessConfiguration(M
 				if (not checkMessage(request, applicationID, serviceType, messageType)) {
 					continue;
 				}
-				// todo: check if message type is valid.
 				auto appServicePair = std::make_pair(applicationID, serviceType);
 				applicationProcessConfiguration.definitions[appServicePair].push_back(
 				    messageType);