diff --git a/inc/ECSS_Definitions.hpp b/inc/ECSS_Definitions.hpp
index 3a2eeedba9ebd9fd6e080c054e485a7936880ae5..1f000979a32969565a7cdee0d7e91f63779da207 100644
--- a/inc/ECSS_Definitions.hpp
+++ b/inc/ECSS_Definitions.hpp
@@ -1,7 +1,6 @@
 #ifndef ECSS_SERVICES_ECSS_DEFINITIONS_H
 #define ECSS_SERVICES_ECSS_DEFINITIONS_H
 
-// Todo: Specify maximum size for regular messages
 #define ECSS_MAX_MESSAGE_SIZE 1024
 
 #define ECSS_MAX_STRING_SIZE 256
diff --git a/inc/Helpers/CRCHelper.hpp b/inc/Helpers/CRCHelper.hpp
index d70ca5782b7a33add0110990bd23c0c2253dd1e7..12da516b2d6718d6743b17779c2fcf01dec178cd 100644
--- a/inc/Helpers/CRCHelper.hpp
+++ b/inc/Helpers/CRCHelper.hpp
@@ -20,7 +20,6 @@ class CRCHelper {
 	 */
 
 // TODO: Change this to hardware implementation or a trusted software one
-// TODO: Use CRC with received TC and transmitted TM packets
 public:
 	/**
 	 * Actual CRC calculation function.
diff --git a/inc/Helpers/TimeHelper.hpp b/inc/Helpers/TimeHelper.hpp
index 6d3bf156cec960316f9878e4f0fd834c9b12b60c..b9039cf346c410ae15563810f67e39685903716b 100644
--- a/inc/Helpers/TimeHelper.hpp
+++ b/inc/Helpers/TimeHelper.hpp
@@ -78,7 +78,6 @@ public:
 	 * (16 for the `DAY` and 32 for the `ms of day`)
  	 * @todo time security for critical time operations
  	 * @todo declare the implicit P-field
- 	 * @todo check if we need milliseconds
 	 */
 	static uint64_t generateCDStimeFormat(struct TimeAndDate &TimeInfo);
 
diff --git a/inc/Message.hpp b/inc/Message.hpp
index 1b1cca380acb2186f35c7d8525a116e1c9c77dc4..fc26623c5014612932681b5b72597dff83de3dc2 100644
--- a/inc/Message.hpp
+++ b/inc/Message.hpp
@@ -67,7 +67,6 @@ public:
 	 * Appends the least significant \p numBits from \p data to the message
 	 *
 	 * Note: data MUST NOT contain any information beyond the most significant \p numBits bits
-	 * @todo Error handling for failed asserts
 	 */
 	void appendBits(uint8_t numBits, uint16_t data);
 
diff --git a/inc/MessageParser.hpp b/inc/MessageParser.hpp
index c8c162f0720d1a1e1036eabbd9c038704dce0c58..4d1985b274f049dd325287de6e623b9a85b0ea4b 100644
--- a/inc/MessageParser.hpp
+++ b/inc/MessageParser.hpp
@@ -7,12 +7,6 @@
 /**
  * A generic class responsible for the execution of the incoming telemetry and telecommand
  * packets.
- *
- * @todo Make the connection between the ST[01]-request verification service and the services
- * that initiate it
- * @todo Implement the execute function in the upcoming services or generally in the upcoming
- * activities
- *
  */
 
 class MessageParser {
@@ -21,11 +15,6 @@ public:
 	/**
 	 * It is responsible to call the suitable function that executes the proper service. The way that
 	 * the services are selected is based on the serviceType of the \p message
-	 *
-	 * @todo The implementation of the execute function should correspond to the numbers of the
-	 * services/activities that have been created
-	 * @todo execute() needs to be redefined. The /p message isn't enough to call some
-	 * subservices. More arguments are needed.
 	 */
 	void execute(Message &message);
 
@@ -56,9 +45,6 @@ private:
 	 *
 	 * As specified in section 7.4.4.1 of the standard
 	 *
-	 * @todo Implement the acknowledgement flags
-	 * @todo Store and parse the source ID, if needed
-	 *
 	 * @param data The data of the header (not null-terminated)
 	 * @param length The size of the header
 	 * @param message The Message to modify based on the header
diff --git a/inc/Services/RequestVerificationService.hpp b/inc/Services/RequestVerificationService.hpp
index 683b74d2b0ebe64e5c14021685e13a830b119fa2..846695c33cca54c3052bebedf913a34def618104 100644
--- a/inc/Services/RequestVerificationService.hpp
+++ b/inc/Services/RequestVerificationService.hpp
@@ -126,10 +126,7 @@ public:
 	 * way that the subservices are selected is for the time being based on the messageType(class
 	 * member of class Message) of the param message
 	 *
-	 * Note:The functions of this service takes dummy values as arguments for the time being
-	 *
-	 * @todo execute() needs to be redefined. The /p message isn't enough to call some
-	 * subservices. More arguments are needed.
+	 * Note: The functions of this service takes dummy values as arguments for the time being
 	 */
 	void execute(const Message &message);
 };
diff --git a/src/Message.cpp b/src/Message.cpp
index 2d32f654ccd26b746380be4e1da50474a961e4c6..6c4f1fb613f6e0a46f767f1a436e91e67cc34f2d 100644
--- a/src/Message.cpp
+++ b/src/Message.cpp
@@ -68,7 +68,6 @@ void Message::appendWord(uint32_t value) {
 
 uint16_t Message::readBits(uint8_t numBits) {
 	assertR(numBits <= 16, ErrorHandler::TooManyBitsRead);
-	// TODO: Add assert
 
 	uint16_t value = 0x0;
 
diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index b61b16dcff7a92cbbeabfe226e983ee6fdc0eee7..92d7055d9d8cc09d71a50030a2116f133fd959ef 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -4,7 +4,7 @@
 
 /**
  * @todo: Check if a uint16_t is needed (in case of changing the size of
- * eventActionDefinitionArray
+ * eventActionDefinitionArray)
  */
 void EventActionService::addEventActionDefinitions(Message message) {
 	// TC[19,1]
@@ -185,8 +185,7 @@ void EventActionService::disableEventActionFunction(Message message) {
 	}
 }
 
-// Should I use the name execute here instead of executeAction?
-// Should I use applicationID too?
+// TODO: Should I use applicationID too?
 void EventActionService::executeAction(uint16_t eventID) {
 	// Custom function
 	if (eventActionFunctionStatus) {
diff --git a/test/Services/EventReportService.cpp b/test/Services/EventReportService.cpp
index 2d76b5cc08511ce8c292b3aca2de8823ea0c12a6..e34dbca9de8352bb4c7afd09ff4f874f9f922161 100644
--- a/test/Services/EventReportService.cpp
+++ b/test/Services/EventReportService.cpp
@@ -6,9 +6,6 @@
 
 EventReportService & eventReportService = Services.eventReport;
 
-/*
- * @todo: Change the reinterpret_cast
- */
 TEST_CASE("Informative Event Report TM[5,1]", "[service][st05]") {
 	const char eventReportData[] = "HelloWorld";
 	char checkString[255];