diff --git a/mission/com/PersistentSingleTmStoreTask.cpp b/mission/com/PersistentSingleTmStoreTask.cpp
index f84738ad..2d05b25f 100644
--- a/mission/com/PersistentSingleTmStoreTask.cpp
+++ b/mission/com/PersistentSingleTmStoreTask.cpp
@@ -8,7 +8,6 @@ PersistentSingleTmStoreTask::PersistentSingleTmStoreTask(
     object_id_t objectId, StorageManagerIF& ipcStore, PersistentTmStoreWithTmQueue& tmStore,
     VirtualChannel& channel, Event eventIfDumpDone, Event eventIfCancelled, SdCardMountedIF& sdcMan)
     : TmStoreTaskBase(objectId, ipcStore, channel, sdcMan),
-      modeHelper(this),
       storeWithQueue(tmStore),
       dumpContext(eventIfDumpDone, eventIfCancelled) {}
 
diff --git a/mission/com/PersistentSingleTmStoreTask.h b/mission/com/PersistentSingleTmStoreTask.h
index d8a1979b..4cbf1544 100644
--- a/mission/com/PersistentSingleTmStoreTask.h
+++ b/mission/com/PersistentSingleTmStoreTask.h
@@ -17,7 +17,6 @@ class PersistentSingleTmStoreTask : public TmStoreTaskBase, public ExecutableObj
   ReturnValue_t performOperation(uint8_t opCode) override;
 
  private:
-  ModeHelper modeHelper;
   PersistentTmStoreWithTmQueue& storeWithQueue;
   DumpContext dumpContext;
   Countdown tcHandlingCd = Countdown(400);
diff --git a/mission/com/SyrlinksHandler.cpp b/mission/com/SyrlinksHandler.cpp
index 84eebeda..297ffd88 100644
--- a/mission/com/SyrlinksHandler.cpp
+++ b/mission/com/SyrlinksHandler.cpp
@@ -99,10 +99,6 @@ ReturnValue_t SyrlinksHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
 }
 
 ReturnValue_t SyrlinksHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
-  if (transitionCommandPending) {
-    return NOTHING_TO_SEND;
-  }
-  transitionCommandPending = true;
   switch (internalState) {
     case InternalState::ENABLE_TEMPERATURE_PROTECTION: {
       *id = syrlinks::WRITE_LCL_CONFIG;
@@ -129,7 +125,6 @@ ReturnValue_t SyrlinksHandler::buildTransitionDeviceCommand(DeviceCommandId_t* i
       return buildCommandFromCommand(*id, nullptr, 0);
     }
     default: {
-      transitionCommandPending = false;
       break;
     }
   }