Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r8492830da5862d7eeaea89d30efb5ea5dcc22572 -r00f98c3a603917bb25450e7686bc75a34c357e97
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 8492830da5862d7eeaea89d30efb5ea5dcc22572)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 00f98c3a603917bb25450e7686bc75a34c357e97)
@@ -565,51 +565,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handlePatientDisconnectionConfirmCmd function handles user
- * confirmation of patient disconnection.
- * @details \b Inputs: Patient disconnection confirmation message.
- * @details \b Outputs: Acceptance response and patient disconnection signal.
- * @param message Pointer to the message to handle.
- * @return TRUE if the confirmation is accepted, FALSE otherwise.
- *************************************************************************/
-BOOL handlePatientDisconnectionConfirmCmd( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-    BOOL modeValid = FALSE;
-    TD_OP_MODE_T mode = getCurrentOperationMode();
-    UI_RESPONSE_PAYLOAD_T response;
-
-    response.rejectionReason = REQUEST_REJECT_REASON_NONE;
-
-    if ( 0 == message->hdr.payloadLen )
-    {
-        modeValid = ( MODE_POST == mode ) ? TRUE : FALSE;
-
-        if ( ( TRUE != modeValid ) )
-        {
-            response.rejectionReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
-        }
-        else
-        {
-            signalUserConfirmPatientDisconnection();
-            result               = TRUE;
-        }
-    }
-    else
-    {
-        response.rejectionReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
-    }
-
-    response.accepted = result;
-    sendMessage( MSG_ID_TD_PATIENT_DISCONNECT_CONFIRM_RESPONSE,
-                 COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)(&response),
-                 sizeof( UI_RESPONSE_PAYLOAD_T ) );
-
-    return result;
-}
-
-/*********************************************************************//**
  * The sendPOSTFinalResult function sends the overall TD POST result
  * and queues the message for transmit on the appropriate CAN channel.
  * @details \b Message \b Sent: MSG_ID_TD_POST_FINAL_TEST_RESULT
@@ -626,55 +581,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleDisposableRemovalConfirmCmd function handles user confirmation
- * of disposable removal.
- * @details \b Inputs: Disposable removal confirmation message.
- * @details \b Outputs: Acceptance response and disposable removal signal.
- * @param message Pointer to the message to handle.
- * @return TRUE if the confirmation is accepted, FALSE otherwise.
- *************************************************************************/
-BOOL handleDisposableRemovalConfirmCmd( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-    BOOL modeValid = FALSE;
-    TD_OP_MODE_T mode = getCurrentOperationMode();
-    UI_RESPONSE_PAYLOAD_T response;
-
-    response.rejectionReason = REQUEST_REJECT_REASON_NONE;
-
-    if ( 0 == message->hdr.payloadLen )
-    {
-        modeValid = ( MODE_POST == mode ) ? TRUE : FALSE;
-
-        if ( FALSE == modeValid )
-        {
-            response.rejectionReason =
-                REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
-        }
-        else
-        {
-            signalUserConfirmDisposableRemoval();
-            result = TRUE;
-        }
-    }
-    else
-    {
-        response.rejectionReason =
-            REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
-    }
-
-    response.accepted = result;
-
-    sendMessage( MSG_ID_TD_POST_TREATMENT_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE,
-                 COMM_BUFFER_OUT_CAN_TD_2_UI,
-                 (U08 *)&response,
-                 sizeof( UI_RESPONSE_PAYLOAD_T ) );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleUIConfirmationResponse function handles a UI response for a
  * confirmation request.
  * @details \b Inputs: none