diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index 679ccfe7..93802bbf 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 167 translations.
  * @details
- * Generated on: 2022-03-22 10:13:22
+ * Generated on: 2022-03-22 10:19:12
  */
 #include "translateEvents.h"
 
@@ -164,10 +164,6 @@ const char *TRANSITION_OTHER_SIDE_FAILED_STRING = "TRANSITION_OTHER_SIDE_FAILED"
 const char *NOT_ENOUGH_DEVICES_DUAL_MODE_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE";
 const char *POWER_STATE_MACHINE_TIMEOUT_STRING = "POWER_STATE_MACHINE_TIMEOUT";
 const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED";
-const char *TRANSITION_OTHER_SIDE_FAILED_STRING = "TRANSITION_OTHER_SIDE_FAILED";
-const char *NOT_ENOUGH_DEVICES_DUAL_MODE_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE";
-const char *POWER_STATE_MACHINE_TIMEOUT_STRING = "POWER_STATE_MACHINE_TIMEOUT";
-const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -493,14 +489,6 @@ const char *translateEvents(Event event) {
       return POWER_STATE_MACHINE_TIMEOUT_STRING;
     case (12203):
       return SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING;
-    case (12300):
-      return TRANSITION_OTHER_SIDE_FAILED_STRING;
-    case (12301):
-      return NOT_ENOUGH_DEVICES_DUAL_MODE_STRING;
-    case (12302):
-      return POWER_STATE_MACHINE_TIMEOUT_STRING;
-    case (12303):
-      return SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING;
     case (13600):
       return ALLOC_FAILURE_STRING;
     case (13601):
diff --git a/generators/fsfwgen b/generators/fsfwgen
index 8829f3fa..8a2caf12 160000
--- a/generators/fsfwgen
+++ b/generators/fsfwgen
@@ -1 +1 @@
-Subproject commit 8829f3face7e90dc855e36593c0a79d3678c3e0f
+Subproject commit 8a2caf120d5a2b46ab3dd05d3b5b1657bf752dad
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index 679ccfe7..93802bbf 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 167 translations.
  * @details
- * Generated on: 2022-03-22 10:13:22
+ * Generated on: 2022-03-22 10:19:12
  */
 #include "translateEvents.h"
 
@@ -164,10 +164,6 @@ const char *TRANSITION_OTHER_SIDE_FAILED_STRING = "TRANSITION_OTHER_SIDE_FAILED"
 const char *NOT_ENOUGH_DEVICES_DUAL_MODE_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE";
 const char *POWER_STATE_MACHINE_TIMEOUT_STRING = "POWER_STATE_MACHINE_TIMEOUT";
 const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED";
-const char *TRANSITION_OTHER_SIDE_FAILED_STRING = "TRANSITION_OTHER_SIDE_FAILED";
-const char *NOT_ENOUGH_DEVICES_DUAL_MODE_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE";
-const char *POWER_STATE_MACHINE_TIMEOUT_STRING = "POWER_STATE_MACHINE_TIMEOUT";
-const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -493,14 +489,6 @@ const char *translateEvents(Event event) {
       return POWER_STATE_MACHINE_TIMEOUT_STRING;
     case (12203):
       return SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING;
-    case (12300):
-      return TRANSITION_OTHER_SIDE_FAILED_STRING;
-    case (12301):
-      return NOT_ENOUGH_DEVICES_DUAL_MODE_STRING;
-    case (12302):
-      return POWER_STATE_MACHINE_TIMEOUT_STRING;
-    case (12303):
-      return SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING;
     case (13600):
       return ALLOC_FAILURE_STRING;
     case (13601):
diff --git a/mission/devices/SusHandler.cpp b/mission/devices/SusHandler.cpp
index 602e0a20..d8879ca8 100644
--- a/mission/devices/SusHandler.cpp
+++ b/mission/devices/SusHandler.cpp
@@ -10,15 +10,6 @@ SusHandler::SusHandler(object_id_t objectId, uint8_t susIdx, object_id_t comIF,
 
 SusHandler::~SusHandler() {}
 
-ReturnValue_t SusHandler::initialize() {
-  ReturnValue_t result = RETURN_OK;
-  result = DeviceHandlerBase::initialize();
-  if (result != RETURN_OK) {
-    return result;
-  }
-  return RETURN_OK;
-}
-
 void SusHandler::doStartUp() {
   if (comState == ComStates::IDLE) {
     comState = ComStates::WRITE_SETUP;
@@ -79,7 +70,7 @@ ReturnValue_t SusHandler::buildTransitionDeviceCommand(DeviceCommandId_t *id) {
     *id = SUS::WRITE_SETUP;
     return buildCommandFromCommand(*id, nullptr, 0);
   }
-  return HasReturnvaluesIF::RETURN_OK;
+  return NOTHING_TO_SEND;
 }
 
 ReturnValue_t SusHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
diff --git a/mission/devices/SusHandler.h b/mission/devices/SusHandler.h
index 18587c71..c1fc08c4 100644
--- a/mission/devices/SusHandler.h
+++ b/mission/devices/SusHandler.h
@@ -32,7 +32,6 @@ class SusHandler : public DeviceHandlerBase {
 
   void enablePeriodicPrintout(bool enable, uint8_t divider);
 
-  virtual ReturnValue_t initialize() override;
   void setToGoToNormalMode(bool enable);
 
  protected:
diff --git a/mission/system/AcsBoardAssembly.cpp b/mission/system/AcsBoardAssembly.cpp
index 61fdc00b..5a8f0956 100644
--- a/mission/system/AcsBoardAssembly.cpp
+++ b/mission/system/AcsBoardAssembly.cpp
@@ -106,7 +106,6 @@ ReturnValue_t AcsBoardAssembly::handleNormalOrOnModeCmd(Mode_t mode, Submode_t s
   auto cmdSeq = [&](object_id_t objectId, Mode_t devMode, ModeTableIdx tableIdx) {
     if (mode == devMode) {
       modeTable[tableIdx].setMode(mode);
-      modeTable[tableIdx].setSubmode(submode);
     } else if (mode == DeviceHandlerIF::MODE_NORMAL) {
       if (isUseable(objectId, devMode)) {
         if (devMode == MODE_ON) {
diff --git a/mission/system/DualLaneAssemblyBase.cpp b/mission/system/DualLaneAssemblyBase.cpp
index 81626033..3460d44f 100644
--- a/mission/system/DualLaneAssemblyBase.cpp
+++ b/mission/system/DualLaneAssemblyBase.cpp
@@ -8,7 +8,7 @@ DualLaneAssemblyBase::DualLaneAssemblyBase(object_id_t objectId, object_id_t par
                                            pcduSwitches::Switches switch2, Event pwrTimeoutEvent,
                                            Event sideSwitchNotAllowedEvent,
                                            Event transitionOtherSideFailedEvent)
-    : AssemblyBase(objectId, parentId),
+    : AssemblyBase(objectId, parentId, 20),
       pwrStateMachine(switch1, switch2, pwrSwitcher),
       pwrTimeoutEvent(pwrTimeoutEvent),
       sideSwitchNotAllowedEvent(sideSwitchNotAllowedEvent),
diff --git a/mission/system/SusAssembly.cpp b/mission/system/SusAssembly.cpp
index 7729a8b9..56b0dba8 100644
--- a/mission/system/SusAssembly.cpp
+++ b/mission/system/SusAssembly.cpp
@@ -27,7 +27,7 @@ ReturnValue_t SusAssembly::commandChildren(Mode_t mode, Submode_t submode) {
   }
   if (recoveryState != RecoveryState::RECOVERY_STARTED) {
     if (mode == DeviceHandlerIF::MODE_NORMAL or mode == MODE_ON) {
-      handleNormalOrOnModeCmd(mode, submode);
+      result = handleNormalOrOnModeCmd(mode, submode);
     }
   }
 
@@ -43,7 +43,6 @@ ReturnValue_t SusAssembly::handleNormalOrOnModeCmd(Mode_t mode, Submode_t submod
   auto cmdSeq = [&](object_id_t objectId, Mode_t devMode, uint8_t tableIdx) {
     if (mode == devMode) {
       modeTable[tableIdx].setMode(mode);
-      modeTable[tableIdx].setSubmode(submode);
     } else if (mode == DeviceHandlerIF::MODE_NORMAL) {
       if (isUseable(objectId, devMode)) {
         if (devMode == MODE_ON) {
@@ -149,11 +148,6 @@ bool SusAssembly::isUseable(object_id_t object, Mode_t mode) {
   return false;
 }
 
-void SusAssembly::handleModeReached() {
-  AssemblyBase::handleModeReached();
-  state = States::IDLE;
-}
-
 void SusAssembly::refreshHelperModes() {
   for (uint8_t idx = 0; idx < helper.susModes.size(); idx++) {
     helper.susModes[idx] = childrenMap[helper.susIds[idx]].mode;
diff --git a/mission/system/SusAssembly.h b/mission/system/SusAssembly.h
index a8a98391..58394709 100644
--- a/mission/system/SusAssembly.h
+++ b/mission/system/SusAssembly.h
@@ -58,7 +58,6 @@ class SusAssembly : public DualLaneAssemblyBase {
   // AssemblyBase overrides
   ReturnValue_t commandChildren(Mode_t mode, Submode_t submode) override;
   ReturnValue_t checkChildrenStateOn(Mode_t wantedMode, Submode_t wantedSubmode) override;
-  void handleModeReached() override;
 
   /**
    * Check whether it makes sense to send mode commands to the device
diff --git a/tmtc b/tmtc
index 6e816c4a..1b961371 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 6e816c4a9c31f57569dacaa38f3dd2cc02be6d4f
+Subproject commit 1b96137148217755c416c8e9554e82bdfe96d31f