Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rbcc80fde38b8b94c64a7ad615f9ca3cb6e98c77e -r176bb5bc32a18891912e179dc1bc9293b370bed4
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision bcc80fde38b8b94c64a7ad615f9ca3cb6e98c77e)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 176bb5bc32a18891912e179dc1bc9293b370bed4)
@@ -145,7 +145,7 @@
     { MSG_ID_UI_DISINFECT_REQUEST,                                      &handleUIDisinfectRequest },
     { MSG_ID_UI_PATIENT_DISCONNECT_CONFIRM_REQUEST,                     &handlePatientDisconnectionConfirmCmd },
     { MSG_ID_UI_POST_TREATMENT_DISPOSABLE_REMOVAL_CONFIRM_REQUEST,      &handleDisposableRemovalConfirmCmd },
-    { MSG_ID_UI_POST_TREATMENT_DISINFECTION_SELECTION_REQUEST,          &handleDisinfectionConfirmCmd },
+    { MSG_ID_TD_DISINFECT_RESPONSE,                                     &handleDisinfectionConfirmCmd },
     { MSG_ID_TD_SOFTWARE_RESET_REQUEST,                                 &testTDSoftwareResetRequest },
     { MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,                                &testBubbleDetectOverride },
     { MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testBubblesDataPublishIntervalOverride },
@@ -561,60 +561,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUIDisinfectRequest function handles a disinfect/flush user
- * action command message from the UI.
- * @details \b Inputs: none
- * @details \b Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-BOOL handleUIDisinfectRequest( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    if ( message->hdr.payloadLen == sizeof(U32) )
-    {
-        U32 cmd;
-
-        memcpy( &cmd, message->payload, sizeof(U32) );
-
-        if ( DD_DISINFECT_FLUSH_STATE == cmd )                          // Command 0 = Flush
-        {
-            result = signalUserInitiateFlushMode();
-        }
-//        else if ( DD_DISINFECT_HEAT_STATE_ACTIVE_COOL == cmd )          // Command 1 = Heat disinfect active cool
-//        {
-//            result = signalUserInitiateHeatDisinfectActiveCoolMode();
-//        }
-//        else if ( DD_DISINFECT_CHEM_STATE == cmd )                      // Command 2 = chemical disinfect
-//        {
-//            result = signalUserInitiateChemicalDisinfectMode();
-//        }
-//        else if ( DD_DISINFECT_CHEM_FLUSH_STATE == cmd )                // Command 3 = chemical disinfect flush
-//        {
-//            result = signalUserInitiateChemicalDisinfectFlushMode();
-//        }
-//        else if ( DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE == cmd )        // Command 4 = RO permeate sample
-//        {
-//            result = signalUserInitiateROPermeateSampleMode();
-//        }
-//        else if ( DD_DISINFECT_HEAT_STATE_PASSIVE_COOL == cmd )         // Command 5 = Heat disinfect passive coode
-//        {
-//            result = signalUserInitiateHeatDisinfectPassiveCoolMode();
-//        }
-//        else if ( DD_DISINFECT_ACTIVE_COOL == cmd )                     // Command 6 = Active cool
-//        {
-//            result = signalUserInitiateActiveCoolMode();
-//        }
-    }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_TD_2_UI, result );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The handlePatientDisconnectionConfirmCmd function handles user
  * confirmation of patient disconnection.
  * @details \b Inputs: Patient disconnection confirmation message.
@@ -707,58 +653,7 @@
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The handleDisinfectionConfirmCmd function handles user selection
- * of the Post-Treatment disinfection operation.
- * @details \b Inputs: Disinfection selection message.
- * @details \b Outputs: Acceptance response and selected disinfection command.
- * @param message Pointer to the message to handle.
- * @return TRUE if the selection is accepted, FALSE otherwise.
- *************************************************************************/
-BOOL handleDisinfectionConfirmCmd( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-    BOOL modeValid = FALSE;
-    TD_OP_MODE_T mode = getCurrentOperationMode();
-    UI_RESPONSE_PAYLOAD_T response;
-    DD_COMMAND_T command  = DD_CMD_NONE;
 
-    response.rejectionReason = REQUEST_REJECT_REASON_NONE;
-
-    if ( sizeof( U32 ) == message->hdr.payloadLen )
-    {
-        modeValid = ( MODE_POST == mode ) ? TRUE : FALSE;
-
-        if ( FALSE == modeValid )
-        {
-            response.rejectionReason =
-                REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
-        }
-        else
-        {
-            memcpy( &command , &message->payload[ 0 ], sizeof(U32) );
-            signalUserConfirmDisinfection( command  );
-            result = TRUE;
-        }
-    }
-    else
-    {
-        response.rejectionReason =
-            REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
-    }
-
-    response.accepted = result;
-
-    sendMessage( MSG_ID_TD_POST_TREATMENT_DISINFECTION_SELECTION_RESPONSE,
-                 COMM_BUFFER_OUT_CAN_TD_2_UI,
-                 (U08 *)&response,
-                 sizeof( UI_RESPONSE_PAYLOAD_T ) );
-
-    return result;
-}
-
-
 // ***********************************************************************
 // ***************** Message Sending Helper Functions ********************
 // ***********************************************************************