diff --git a/inc/Helpers/ForwardControlConfiguration.hpp b/inc/Helpers/ForwardControlConfiguration.hpp
index 353a481bd9b6a9fcaf9d343bdb93f74e5cb257e7..9ac00bef76bf33974643c55f178a1880cb6d2ed2 100644
--- a/inc/Helpers/ForwardControlConfiguration.hpp
+++ b/inc/Helpers/ForwardControlConfiguration.hpp
@@ -35,8 +35,6 @@ public:
 	 */
 	etl::map<uint8_t, reportsAreNotEmpty, ECSSMaxControlledApplications> serviceNotEmpty;
 
-//	etl::map<uint8_t, bool, ECSSMaxControlledApplications> serviceOfAppNotEmpty;
-
 	/**
 	 * Vector containing the Report Type definitions. Each definition has its unique name of type uint8. For
 	 * example, a Report Type definition could be 'ReportHousekeepingStructures'.
diff --git a/src/Services/RealTimeForwardingControlService.cpp b/src/Services/RealTimeForwardingControlService.cpp
index 03bb89d151309f3cb9a0362be7eaaebd967b827c..98d61e436f01cb9ced726e770ab3df8ee488c515 100644
--- a/src/Services/RealTimeForwardingControlService.cpp
+++ b/src/Services/RealTimeForwardingControlService.cpp
@@ -99,7 +99,6 @@ void RealTimeForwardingControlService::addReportTypesToAppProcessConfiguration(M
 		}
 
 		if (numOfServices == 0) {
-			// todo: add all report types of the application process to the configuration.
 			applicationProcessConfiguration.definitions[applicationID].clear();
 			continue;
 		}
@@ -114,7 +113,6 @@ void RealTimeForwardingControlService::addReportTypesToAppProcessConfiguration(M
 			}
 
 			if (numOfMessages == 0) {
-				// todo: add all report types of the service type to the configuration.
 				applicationProcessConfiguration.definitions[applicationID][serviceType].clear();
 				continue;
 			}
diff --git a/test/Services/RealTimeForwardingControl.cpp b/test/Services/RealTimeForwardingControl.cpp
index fb92846a7d65f9530f0956dadfc79dfdc55e51aa..32570d236605f562895dac0ec367a23320178033 100644
--- a/test/Services/RealTimeForwardingControl.cpp
+++ b/test/Services/RealTimeForwardingControl.cpp
@@ -506,6 +506,10 @@ TEST_CASE("Add report types to the Application Process Configuration") {
 		CHECK(ServiceTests::count() == 1);
 		CHECK(ServiceTests::countThrownErrors(ErrorHandler::ExecutionStartErrorType::NotControlledApplication) == 1);
 		auto& applicationProcesses = realTimeForwarding.applicationProcessConfiguration.definitions;
+
+		REQUIRE(applicationProcesses.find(applicationID1) != applicationProcesses.end());
+		REQUIRE(applicationProcesses.find(applicationID2) != applicationProcesses.end());
+		REQUIRE(applicationProcesses.find(3) == applicationProcesses.end());
 		REQUIRE(applicationProcesses[applicationID1].empty());
 		REQUIRE(applicationProcesses[applicationID2].empty());