Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r52362c924eb6233f0a23f6978ea3ce6a2b1b9376 -r89f4c7f0995e2094b3f26fc7e7e12371e847abac
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 52362c924eb6233f0a23f6978ea3ce6a2b1b9376)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac)
@@ -72,7 +72,6 @@
 static U32  rinsebackAdditionalTimerCtr;                                    ///< Timer counter for duration of an additional rinseback delivery.
 static U32  rinsebackPublishTimerCtr;                                       ///< Timer counter for determining interval for rinseback status to be published.
 
-static BOOL rinsebackStopRequested;                                         ///< Flag indicates alarm requesting to stop rinseback.
 static BOOL startRinsebackRequested;                                        ///< Flag indicates user requesting rinseback start (confirming saline bag move to arterial line end).
 static BOOL incrRinsebackFlowRateRequested;                                 ///< Flag indicates user requesting rinseback flow rate be increased.
 static BOOL decrRinsebackFlowRateRequested;                                 ///< Flag indicates user requesting rinseback flow rate be decreased.
@@ -142,7 +141,6 @@
  *************************************************************************/
 static void resetRinsebackFlags( void )
 {
-    rinsebackStopRequested = FALSE;
     startRinsebackRequested = FALSE;
     incrRinsebackFlowRateRequested = FALSE;
     decrRinsebackFlowRateRequested = FALSE;
@@ -381,7 +379,7 @@
         result = RINSEBACK_PAUSED_STATE;
     }
     // Has user or alarm requested rinseback pause?
-    else if ( ( TRUE == pauseRinsebackRequested ) || ( TRUE == rinsebackStopRequested ) )
+    else if ( ( TRUE == pauseRinsebackRequested ) || ( TRUE == doesAlarmStatusIndicateStop() ) )
     {
         setupForRinsebackStopOrPause();
         result = RINSEBACK_PAUSED_STATE;
@@ -542,7 +540,7 @@
         result = RINSEBACK_STOP_STATE;
     }
     // Has alarm requested stop?
-    else if( TRUE == rinsebackStopRequested )
+    else if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         setupForRinsebackStopOrPause();
         result = RINSEBACK_STOP_STATE;
@@ -553,19 +551,6 @@
 
 /*********************************************************************//**
  * @brief
- * The signalStopRinseback function signals the rinseback sub-mode
- * to stop per an active alarm.
- * @details Inputs: none
- * @details Outputs: rinsebackStopRequested
- * @return none
- *************************************************************************/
-void signalStopRinseback( void )
-{
-    rinsebackStopRequested = TRUE;
-}
-
-/*********************************************************************//**
- * @brief
  * The signalRinsebackUserAction function signals a rinseback user action
  * has been requested.  The request is handled and responded to.
  * @details Inputs: none