diff --git a/linux/payload/FreshMpsocHandler.cpp b/linux/payload/FreshMpsocHandler.cpp
index 021ebc5a..65c273c2 100644
--- a/linux/payload/FreshMpsocHandler.cpp
+++ b/linux/payload/FreshMpsocHandler.cpp
@@ -296,8 +296,6 @@ ReturnValue_t FreshMpsocHandler::executeAction(ActionId_t actionId, MessageQueue
     default:
       break;
   }
-  // For longer commands, do not set these.
-  // TODO: Do all the stuff the form buildDeviceFromDevice blah did.
   executeRegularCmd(actionId, commandedBy, data, size);
   return returnvalue::OK;
 }
@@ -788,7 +786,6 @@ ReturnValue_t FreshMpsocHandler::finishAndSendTc(DeviceCommandId_t cmdId, mpsoc:
   if (result != returnvalue::OK) {
     return result;
   }
-  // TODO: We should find a way so this works with the old implementation.
   commandSequenceCount++;
 
   mpsoc::printTxPacket(tcBase);
@@ -836,8 +833,6 @@ void FreshMpsocHandler::cmdDoneHandler(bool success, ReturnValue_t result) {
 ReturnValue_t FreshMpsocHandler::handleDeviceReply() {
   ReturnValue_t result = returnvalue::OK;
 
-  // SpacePacketReader spacePacket;
-  // spacePacket.setReadOnlyData(start, remainingSize);
   const auto& replyReader = comInterface.getSpReader();
   if (replyReader.isNull()) {
     return returnvalue::FAILED;
@@ -889,15 +884,14 @@ ReturnValue_t FreshMpsocHandler::handleDeviceReply() {
     default: {
       sif::debug << "FreshMpsocHandler:: Reply has invalid APID 0x" << std::hex << std::setfill('0')
                  << std::setw(2) << apid << std::dec << std::endl;
-      //*foundLen = remainingSize;
       return mpsoc::INVALID_APID;
     }
   }
 
-  // TODO: We should implement some way so this can also be used with the former implementation.
   uint16_t sequenceCount = replyReader.getSequenceCount();
   if (sequenceCount != lastReplySequenceCount + 1) {
-    // TODO: Trigger event for possible missing reply packet to inform operator.
+    // We could trigger event for possible missing reply packet to inform operator, but I don't
+    // think this is properly implemented and used on the MPSoC side anymore.
   }
   lastReplySequenceCount = sequenceCount;
 
@@ -952,7 +946,6 @@ ReturnValue_t FreshMpsocHandler::handleAckReport() {
 
   switch (replyReader.getApid()) {
     case mpsoc::apid::ACK_FAILURE: {
-      // DeviceCommandId_t commandId = getPendingCommand();
       uint16_t status = mpsoc::getStatusFromRawData(replyReader.getFullData());
       sif::warning << "MPSoC ACK Failure: " << mpsoc::getStatusString(status) << std::endl;
       triggerEvent(mpsoc::ACK_FAILURE, activeCmdInfo.pendingCmd, status);
diff --git a/linux/payload/plocMpsocHelpers.h b/linux/payload/plocMpsocHelpers.h
index f92b43ca..60356f56 100644
--- a/linux/payload/plocMpsocHelpers.h
+++ b/linux/payload/plocMpsocHelpers.h
@@ -215,8 +215,6 @@ static const DeviceCommandId_t OBSW_RESET_SEQ_COUNT_LEGACY = 50;
 
 static const uint16_t SIZE_ACK_REPORT = 14;
 static const uint16_t SIZE_EXE_REPORT = 14;
-// static const uint16_t SIZE_TM_MEM_READ_REPORT = 18;
-// static const uint16_t SIZE_TM_CAM_CMD_RPT = 18;
 static constexpr size_t SIZE_TM_HK_REPORT = 369;
 
 enum Submode : uint8_t { IDLE_OR_NONE = 0, REPLAY = 1, SNAPSHOT = 2 };