Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r92b5a051b1a280b4555b2ab779965c6758e47785 -r561c8ae6df3c144944a2cc5ba2bb4f13ad904972
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 92b5a051b1a280b4555b2ab779965c6758e47785)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 561c8ae6df3c144944a2cc5ba2bb4f13ad904972)
@@ -69,18 +69,6 @@
 static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184 / SEC_PER_MIN;                                                      ///< Water specific heat in J/KgC / 60.
 static const F32 PRIMARY_HEATERS_MAXIMUM_POWER_WATTS    = 475 + 237.5F;                                                            ///< Primary heaters maximum power (main primary = 475W and small primary = 237.5W).
 
-/// 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
 {
@@ -91,7 +79,7 @@
     F32  dutycycle;                                                                                                                ///< Heater duty cycle.
     F32  targetFlow;                                                                                                               ///< Heater target flow.
     BOOL hasTargetTempChanged;                                                                                                     ///< Heater target temperature change flag indicator.
-    F32  heaterEfficiency;                                                                                                         ///< Heater efficiency during the run.
+    F32  heaterEstGain;                                                                                                            ///< Heater efficiency during the run.
     BOOL hasTargetBeenReached;                                                                                                     ///< Heater flag to indicate whether the target temperature has been reached.
     F32 calculatedTemperature;                                                                                                     ///< Heater calculated temperature.
     DG_RESERVOIR_ID_T inactiveRsrvr;                                                                                               ///< Heater inactive reservoir.
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -ra89d6b091874136d75a9bfbdbbc1ff00f42467b3 -r561c8ae6df3c144944a2cc5ba2bb4f13ad904972
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a89d6b091874136d75a9bfbdbbc1ff00f42467b3)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 561c8ae6df3c144944a2cc5ba2bb4f13ad904972)
@@ -149,7 +149,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;
     }