diff --git a/src/boards/Main/Configs/ActuatorsConfigs.h b/src/boards/Main/Configs/ActuatorsConfigs.h
index 1cb694624456fcd2fca370b38cf8adf0365cd973..2a8bd2e7b6ca9ba3dabb870de48c6864ed55a464 100644
--- a/src/boards/Main/Configs/ActuatorsConfigs.h
+++ b/src/boards/Main/Configs/ActuatorsConfigs.h
@@ -36,9 +36,7 @@ static TIM_TypeDef* const ABK_SERVO_TIMER = TIM10;
 constexpr Boardcore::TimerUtils::Channel ABK_SERVO_PWM_CH =
     Boardcore::TimerUtils::Channel::CHANNEL_1;
 
-// TODO: Fix rotation value
-constexpr float ABK_SERVO_ROTATION = 66.4;  // [deg] AirBrakes without end stop
-// constexpr float ABK_SERVO_ROTATION  = 65;  // [deg] AirBrakes with end stop
+constexpr float ABK_SERVO_ROTATION  = 66.4;  // [deg] AirBrakes without end stop
 constexpr float ABK_SERVO_MIN_PULSE = 1405;  // [deg]
 constexpr float ABK_SERVO_MAX_PULSE =
     ABK_SERVO_MIN_PULSE - 10 * ABK_SERVO_ROTATION;  // [us]
diff --git a/src/boards/Main/Radio/Radio.cpp b/src/boards/Main/Radio/Radio.cpp
index e1a542bf49b0eaa10b6804bcee1164527bec8e21..1be385ec93c0f01c9672a189a505378fed1c166e 100644
--- a/src/boards/Main/Radio/Radio.cpp
+++ b/src/boards/Main/Radio/Radio.cpp
@@ -88,11 +88,7 @@ Boardcore::MavlinkStatus Radio::getMavlinkStatus()
     return mavDriver->getStatus();
 }
 
-void Radio::logStatus()
-{
-    Logger::getInstance().log(mavDriver->getStatus());
-    // TODO: Add transceiver status logging
-}
+void Radio::logStatus() { Logger::getInstance().log(mavDriver->getStatus()); }
 
 Radio::Radio()
 {
diff --git a/src/boards/Main/TMRepository/TMRepository.cpp b/src/boards/Main/TMRepository/TMRepository.cpp
index e2194245ce8eda8655aaabeb5df4f701bbe5c8a3..f0f5c087ea9cba36ee14b78f1c78df548a54c208 100644
--- a/src/boards/Main/TMRepository/TMRepository.cpp
+++ b/src/boards/Main/TMRepository/TMRepository.cpp
@@ -473,23 +473,6 @@ mavlink_message_t TMRepository::packSensorsTm(SensorsTMList sensorId,
 
             break;
         }
-        case SensorsTMList::MAV_CURRENT_SENSE_ID:  // TODO
-        {
-            mavlink_current_tm_t tm;
-
-            // auto currentData =
-            // Sensors::getInstance().getCurrentSensorLastSample();
-
-            // tm.timestamp = currentData.timestamp;
-            strcpy(tm.sensor_id, "5V_CURRENT");
-            // tm.current = currentData.current;
-
-            mavlink_msg_current_tm_encode(RadioConfig::MAV_SYSTEM_ID,
-                                          RadioConfig::MAV_COMPONENT_ID, &msg,
-                                          &tm);
-
-            break;
-        }
         case SensorsTMList::MAV_DPL_PRESS_ID:
         {
             mavlink_pressure_tm_t tm;
diff --git a/src/hardware_in_the_loop/HIL/HILFlightPhasesManager.cpp b/src/hardware_in_the_loop/HIL/HILFlightPhasesManager.cpp
index 49c3d48776e7d31f2e49ed10dba2a810a2167a63..dacffb383f4ff9f6819519a354e96b11aa728b1a 100644
--- a/src/hardware_in_the_loop/HIL/HILFlightPhasesManager.cpp
+++ b/src/hardware_in_the_loop/HIL/HILFlightPhasesManager.cpp
@@ -185,12 +185,12 @@ void HILFlightPhasesManager::printOutcomes()
  */
 void HILFlightPhasesManager::updateFlags(FlightPhasesFlags hil_flags)
 {
-    // [TODO] add ifdefs in order to select which flags to take from matlab
+    // TODO: Add ifdefs in order to select which flags to take from matlab
     flagsFlightPhases[FlightPhases::ASCENT]  = hil_flags.flag_ascent;
     flagsFlightPhases[FlightPhases::FLYING]  = hil_flags.flag_flight;
     flagsFlightPhases[FlightPhases::BURNING] = hil_flags.flag_burning;
 
-    /* Flags PARA1, PARA2 and SIM_AEROBRAKES ignored from matlab  */
+    // Flags PARA1, PARA2 and SIM_AEROBRAKES ignored from matlab
     // flagsFlightPhases[SIM_AEROBRAKES] = hil_flags.flag_airbrakes;
     // flagsFlightPhases[PARA1]          = hil_flags.flag_para1;
     // flagsFlightPhases[PARA2]          = hil_flags.flag_para2;
diff --git a/src/hardware_in_the_loop/HIL_sensors/HILGps.h b/src/hardware_in_the_loop/HIL_sensors/HILGps.h
index e734e3f0e1e4ad177e1e43ee0d6ee03467ea68e9..cc3c775590f11467b735973be2de69c3aa762b17 100644
--- a/src/hardware_in_the_loop/HIL_sensors/HILGps.h
+++ b/src/hardware_in_the_loop/HIL_sensors/HILGps.h
@@ -57,7 +57,7 @@ protected:
         tempData.velocityDown  = matlabData.getZ();
         tempData.speed = sqrtf(tempData.velocityNorth * tempData.velocityNorth +
                                tempData.velocityDown * tempData.velocityDown);
-        tempData.positionDOP = 0;  // TODO: what's this?
+        tempData.positionDOP = 0;
 
         tempData.fix        = (uint8_t)sensorData->gps.fix;
         tempData.satellites = (uint8_t)sensorData->gps.num_satellites;