Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r94b2082ddcec6ccb947e67714dc85ae005a2c7b6 -r9f3943dcab5881216ef0119e7de3a36668dea3bc
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 94b2082ddcec6ccb947e67714dc85ae005a2c7b6)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9f3943dcab5881216ef0119e7de3a36668dea3bc)
@@ -27,7 +27,6 @@
 #include "Heaters.h"
 #include "LoadCell.h"
 #include "MessagePayloads.h"
-#include "ModeHeatDisinfect.h"
 #include "ModeStandby.h"
 #include "ModeRecirculate.h"
 #include "MsgQueues.h"
@@ -43,7 +42,6 @@
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
 #include "Utilities.h"
-#include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
 #include "UVReactors.h"
@@ -2477,7 +2475,7 @@
  *************************************************************************/
 BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL status = FALSE;
 
     if ( message->hdr.payloadLen == sizeof(U32) )
     {
@@ -2487,18 +2485,17 @@
 
         if ( TRUE == startingDGHeatDisinfect )
         {
-            startDGHeatDisinfect();
-            result = TRUE;
+            status = startDGHeatDisinfect();
         }
         else
         {
-            stopDGHeatDisinfect();
-            result = TRUE;
+            status = stopDGHeatDisinfect();
         }
     }
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
 
-    return result;
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, status );
+
+    return status;
 }
 
 /**@}*/