Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -ra43996d4383527a14cffe8bc676cccc6bd93c174 -r9aa6661b2587e183f10728db3eb3c6e631fe2df1
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a43996d4383527a14cffe8bc676cccc6bd93c174)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 9aa6661b2587e183f10728db3eb3c6e631fe2df1)
@@ -74,18 +74,6 @@
 static const F32 PRIMARY_HEATERS_MAXIMUM_POWER_WATTS    = 475 + 237.5F;                                                            ///< Primary heaters maximum power (main primary = 475W and small primary = 237.5W).
 static const F32 HEATERS_VOLTAGE_TOLERANCE_V            = HEATERS_MAX_OPERATING_VOLTAGE_V * HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL;  ///< Heaters voltage tolerance in volts.
 
-/// Heaters exec states
-typedef enum Heaters_Exec_States
-{
-    HEATER_EXEC_STATE_OFF = 0,                                                                                                     ///< Heater exec state off.
-    HEATER_EXEC_STATE_PRIMARY_RAMP_TO_TARGET,                                                                                      ///< Heater exec state primary ramp to target.
-    HEATER_EXEC_STATE_PRIMARY_CONTROL_TO_TARGET,                                                                                   ///< Heater exec state primary control to target.
-    HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET,                                                                                 ///< Heater exec state control to disinfect (heat or chemical) target.
-    HEATER_EXEC_STATE_TRIMMER_RAMP_TO_TARGET,                                                                                      ///< Heater exec state trimmer ramp to target.
-    HEATER_EXEC_STATE_TRIMMER_CONTROL_TO_TARGET,                                                                                   ///< Heater exec state trimmer control to target.
-    NUM_OF_HEATERS_STATE,                                                                                                          ///< Number of heaters state.
-} HEATERS_STATE_T;
-
 /// Heaters data structure
 typedef struct
 {
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r46bf7baaa9d8095e0405b018fcd4bc594907797e -r9aa6661b2587e183f10728db3eb3c6e631fe2df1
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 46bf7baaa9d8095e0405b018fcd4bc594907797e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9aa6661b2587e183f10728db3eb3c6e631fe2df1)
@@ -152,7 +152,7 @@
 
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_STANDBY_MODE_INVALID_EXEC_STATE, standbyState )
-            standbyState = DG_STANDBY_MODE_STATE_START;
+            standbyState = DG_STANDBY_MODE_STATE_IDLE;
             break;
     }