Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r3fa3bf8d5bf51649dd00756484344daa7dbf6e73 -rebd9aed9d273db8635bc1dd6db189f2a9f591450
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 3fa3bf8d5bf51649dd00756484344daa7dbf6e73)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision ebd9aed9d273db8635bc1dd6db189f2a9f591450)
@@ -37,9 +37,6 @@
 #include "TaskPriority.h"
 #include "Timers.h"
 #include "Valves.h"
-#ifdef EMC_TEST_BUILD
-#include "Heaters.h"
-#endif
 
 /**
  *  @addtogroup ROPump
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r34d830c022c7d27c5f97e340f692b566efcfca89 -rebd9aed9d273db8635bc1dd6db189f2a9f591450
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 34d830c022c7d27c5f97e340f692b566efcfca89)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision ebd9aed9d273db8635bc1dd6db189f2a9f591450)
@@ -1367,7 +1367,6 @@
     {
         prevHeatDisinfectState      = state;
         alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT; // TODO - cool down alarm?
-        cancellationMode            = CANCELLATION_MODE_HOT;
         state                       = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
     }