Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r88696f3c6a5d82503064a73433d39fa000728d93 -rbd552b98354cef7d9c028f25635e0334c7aecf28
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 88696f3c6a5d82503064a73433d39fa000728d93)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision bd552b98354cef7d9c028f25635e0334c7aecf28)
@@ -156,28 +156,6 @@
 
 /*********************************************************************//**
  * @brief
- * The userRequestEndTreatment function conveys a user request to end the
- * treatment.
- * @details Inputs: currentTreatmentState
- * @details Outputs: response to user request sent
- * @return TRUE if request accepted, FALSE if not
- *************************************************************************/
-//BOOL userRequestEndTreatment( void )
-//{
-//    BOOL result = FALSE;
-//
-//    if ( TREATMENT_STOP_STATE == currentTreatmentState )
-//    {
-//        pendingUserEndTreatmentRequest = TRUE;
-//        result = TRUE;
-//    }
-//    sendTreatmentEndResponseMsg( result );
-//
-//    return result;
-//}
-
-/*********************************************************************//**
- * @brief
  * The signalAlarmActionToTreatmentMode function executes the given alarm action
  * as appropriate while in Treatment Mode.
  * @details Inputs: none
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r88696f3c6a5d82503064a73433d39fa000728d93 -rbd552b98354cef7d9c028f25635e0334c7aecf28
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 88696f3c6a5d82503064a73433d39fa000728d93)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision bd552b98354cef7d9c028f25635e0334c7aecf28)
@@ -1187,10 +1187,6 @@
             handleUIUserConfirmTreatmentParameters( message );
             break;
 
-//        case MSG_ID_UI_TREATMENT_END_REQUEST:
-//            handleUIUserEndTreatmentRequest( message );
-//            break;
-
         case MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST:
             handleChangePressureLimitsRequest( message );
             break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r88696f3c6a5d82503064a73433d39fa000728d93 -rbd552b98354cef7d9c028f25635e0334c7aecf28
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 88696f3c6a5d82503064a73433d39fa000728d93)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bd552b98354cef7d9c028f25635e0334c7aecf28)
@@ -1734,56 +1734,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUIUserEndTreatmentRequest function handles a treatment end
- * request message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-//void handleUIUserEndTreatmentRequest( MESSAGE_T *message )
-//{
-//    BOOL result = FALSE;
-//
-//    if ( message->hdr.payloadLen == 0 )
-//    {
-//        result = userRequestEndTreatment();
-//    }
-//
-//    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
-//}
-
-/*********************************************************************//**
- * @brief
- * The sendTreatmentEndResponseMsg function constructs a treatment end
- * request response message to the UI and queues the msg for transmit on
- * the appropriate CAN channel.
- * @details Inputs: none
- * @details Outputs: Treatment end response msg constructed and queued.
- * @param accepted T/F - request accepted?
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-//BOOL sendTreatmentEndResponseMsg( BOOL accepted )
-//{
-//    BOOL result;
-//    MESSAGE_T msg;
-//    U08 *payloadPtr = msg.payload;
-//
-//    // Create a message record
-//    blankMessage( &msg );
-//    msg.hdr.msgID = MSG_ID_HD_TREATMENT_END_RESPONSE;
-//    msg.hdr.payloadLen = sizeof( BOOL );
-//
-//    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
-//
-//    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-//    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
-//
-//    return result;
-//}
-
-/*********************************************************************//**
- * @brief
  * The handleTreatmentParametersFromUI function handles a treatment parameters
  * set and validate request message from the UI.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r88696f3c6a5d82503064a73433d39fa000728d93 -rbd552b98354cef7d9c028f25635e0334c7aecf28
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 88696f3c6a5d82503064a73433d39fa000728d93)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision bd552b98354cef7d9c028f25635e0334c7aecf28)
@@ -97,12 +97,6 @@
 // MSG_ID_HD_START_TREATMENT_RESPONSE
 BOOL sendTreatmentStartResponseMsg( BOOL accepted, U32 reason );
 
-// MSG_ID_UI_TREATMENT_END_REQUEST
-void handleUIUserEndTreatmentRequest( MESSAGE_T *message );
-
-// MSG_ID_HD_TREATMENT_END_RESPONSE
-//BOOL sendTreatmentEndResponseMsg( BOOL accepted );
-
 // MSG_ID_UI_NEW_TREATMENT_PARAMS
 void handleTreatmentParametersFromUI( MESSAGE_T *message );