Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r4151ee46ace3cc66b6b7c0f276040889fe0d75e6 -r89f4c7f0995e2094b3f26fc7e7e12371e847abac
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 4151ee46ace3cc66b6b7c0f276040889fe0d75e6)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac)
@@ -45,7 +45,6 @@
 
 static U32  txEndTimerCtr;                                                  ///< Timer counter (in GP task intervals) counts time spent waiting for user to initiate final rinseback.
 
-static BOOL txEndStopRequested;                                             ///< Flag indicates alarm requesting to stop slow blood flow.
 static BOOL txEndAlarmResumeRequested;                                      ///< Flag indicates user requesting resume from alarm.
 static BOOL txEndAlarmRinsebackRequested;                                   ///< Flag indicates user requesting rinseback from alarm.
 static BOOL txEndAlarmEndTreatmentRequested;                                ///< Flag indicates user requesting end treatment from alarm.
@@ -87,7 +86,6 @@
  *************************************************************************/
 static void resetTreatmentEndFlags( void )
 {
-    txEndStopRequested = FALSE;
     txEndAlarmResumeRequested = FALSE;
     txEndAlarmRinsebackRequested = FALSE;
     txEndAlarmEndTreatmentRequested = FALSE;
@@ -120,7 +118,7 @@
     startAirTrapControl();
 
     // Set user alarm recovery actions allowed in this sub-mode
-    setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
+    setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 }
@@ -209,7 +207,7 @@
     TREATMENT_END_STATE_T result = TREATMENT_END_WAIT_FOR_RINSEBACK_STATE;
 
     // Is alarm stop or user reconnect requested?
-    if ( TRUE == txEndStopRequested )
+    if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         setupForTxEndPausedState();
         result = TREATMENT_END_PAUSED_STATE;
@@ -262,19 +260,6 @@
 
 /*********************************************************************//**
  * @brief
- * The signalStopTreatmentEnd function signals the treatment end
- * sub-mode to stop per an active alarm.
- * @details Inputs: none
- * @details Outputs: txEndStopRequested
- * @return none
- *************************************************************************/
-void signalStopTreatmentEnd( void )
-{
-    txEndStopRequested = TRUE;
-}
-
-/*********************************************************************//**
- * @brief
  * The signalTreatmentEndAlarmResumeUserAction function signals the treatment end
  * sub-mode to stop per an active alarm.
  * @details Inputs: none