Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8 -r19f13e67288117e7f81c1245a75cc6b5f8aaf899
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 19f13e67288117e7f81c1245a75cc6b5f8aaf899)
@@ -40,12 +40,11 @@
 #include "TreatmentEnd.h"
 #include "TreatmentRecirc.h"
 #include "TreatmentStop.h"
-#include "Update.h"
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
 #include "HDDefs.h"
-#include "TaskPriority.h"
+#include "TaskPriority.h"
 
 /**
  *  @addtogroup SystemCommMessages
@@ -8080,74 +8079,4 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The handleSetBootloaderRequest function handles a
- * request to set the flag to trigger update mode
- * after a reboot.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleSetBootloaderRequest( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( 0 == message->hdr.payloadLen )
-    {
-        result = setBootloaderFlag();
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
- * The handleEnterBootloaderNowRequest function handles a
- * request immediately jump to the bootloader application.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleEnterBootloaderNowRequest( MESSAGE_T *message )
-{
-    BOOL result = (0 == message->hdr.payloadLen);
-
-    // respond to request immediately with whether it was formatted correctly
-    sendTestAckResponseMsg((MSG_ID_T)message->hdr.msgID, result);
-
-    if (result)
-    {
-        // Jump to the bootloader, there is no coming back from this.
-        startBootloader();
-    }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleEnterBootloaderNowRequest function handles a
- * request immediately jump to the bootloader application.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleRebootNowRequest( MESSAGE_T *message )
-{
-    BOOL result = (0 == message->hdr.payloadLen);
-
-    // respond to request immediately with whether it was formatted correctly
-    sendTestAckResponseMsg((MSG_ID_T)message->hdr.msgID, result);
-
-    if (result)
-    {
-        // Jump to the bootloader, there is no coming back from this.
-        startBootloader();
-    }
-}
-
 /**@}*/