Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r853ebb4569739cf4d0ea75b7d3c11571f0f3d000 -r3c9724b7e07c1a82d0e7fd653a99d7cb96d06e5a
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 853ebb4569739cf4d0ea75b7d3c11571f0f3d000)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 3c9724b7e07c1a82d0e7fd653a99d7cb96d06e5a)
@@ -105,7 +105,6 @@
 static BOOL handleAdditionalRinsebackUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
 static BOOL handleToRecircUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
 static BOOL handleBackToTreatmentUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
-static BOOL handleEndTreatmentUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
 
 static void publishRinsebackData( void );
 static U32 getPublishRinsebackInterval( void );
@@ -272,7 +271,7 @@
  * @brief
  * The execRinseback function executes the Rinseback sub-mode state machine.
  * @details Inputs: rinsebackState
- * @details Outputs: rinsebackState, rinsebackTimerCtr, flags
+ * @details Outputs: rinsebackState, rinsebackTimerCtr, endTreatmentRequested, flags
  * @return none
  *************************************************************************/
 void execRinseback( void )
@@ -946,33 +945,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleEndTreatmentUserAction function handles an end treatment
- * user action request.  It is assumed that the calling function will set
- * the reject reason parameter to None beforehand.
- * @details Inputs: rinsebackState
- * @details Outputs: end treatment if appropriate
- * @param rejReason Code indicating reason for rejection
- * @return TRUE if user action accepted, FALSE if not
- *************************************************************************/
-static BOOL handleEndTreatmentUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason )
-{
-    BOOL result = FALSE;
-
-    if ( ( RINSEBACK_STOP_INIT_STATE != rinsebackState ) && ( RINSEBACK_STOP_STATE != rinsebackState ) )
-    {
-        *rejReason = REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE;
-    }
-    else
-    {
-        result = TRUE;
-        endTreatmentRequested = TRUE;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishRinsebackData function publishes rinseback progress to UI
  * at 1 Hz interval.
  * @details Inputs: rinsebackPublishTimerCtr, rinsebackTimerCtr, rinsebackState,
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r853ebb4569739cf4d0ea75b7d3c11571f0f3d000 -r3c9724b7e07c1a82d0e7fd653a99d7cb96d06e5a
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 853ebb4569739cf4d0ea75b7d3c11571f0f3d000)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 3c9724b7e07c1a82d0e7fd653a99d7cb96d06e5a)
@@ -177,7 +177,7 @@
  * The execTreatmentEnd function executes the Treatment End sub-mode
  * state machine.
  * @details Inputs: treatmentEndState
- * @details Outputs: treatmentEndState
+ * @details Outputs: treatmentEndState, txEndAlarmEndTreatmentRequested
  * @return none
  *************************************************************************/
 void execTreatmentEnd( void )
Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -r853ebb4569739cf4d0ea75b7d3c11571f0f3d000 -r3c9724b7e07c1a82d0e7fd653a99d7cb96d06e5a
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 853ebb4569739cf4d0ea75b7d3c11571f0f3d000)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 3c9724b7e07c1a82d0e7fd653a99d7cb96d06e5a)
@@ -67,7 +67,6 @@
 static BOOL handleRecircReconnectUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
 static BOOL handleRecicConfirmReconnectUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
 static BOOL handleRecircResumeUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
-static BOOL handleRecircEndTreatmentUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
 static BOOL handleRecircConfirmDisconnectUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason );
 
 static void publishTreatmentRecircData( void );
@@ -178,7 +177,7 @@
  * The execTreatmentRecirc function executes the Treatment circulate sub-mode
  * state machine.
  * @details Inputs: treatmentRecircState
- * @details Outputs: treatmentRecircState, recircTimerCtr
+ * @details Outputs: treatmentRecircState, recircTimerCtr, recircEndTreatmentRequested
  * @return none
  *************************************************************************/
 void execTreatmentRecirc( void )
@@ -485,26 +484,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleRecircEndTreatmentUserAction function handles an end treatment
- * user action request.  It is assumed that the calling function will set
- * the reject reason parameter to None beforehand.
- * @details Inputs: treatmentRecircState
- * @details Outputs: ending of treatment action handled
- * @param rejReason Code indicating reason for rejection
- * @return TRUE if user action accepted, FALSE if not
- *************************************************************************/
-static BOOL handleRecircEndTreatmentUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason )
-{
-    BOOL result = FALSE;
-
-    result = TRUE;
-    recircEndTreatmentRequested = TRUE;
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleRecircConfirmDisconnectUserAction function handles a confirm
  * patient disconnect user action request.  It is assumed that the calling
  * function will set the reject reason parameter to None beforehand.