Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -r92a6afc17ff42b5e8028d5a7fcbae02459e39dba -r89f4c7f0995e2094b3f26fc7e7e12371e847abac
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 92a6afc17ff42b5e8028d5a7fcbae02459e39dba)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac)
@@ -48,7 +48,6 @@
 static U32  recircTimerCtr;                                                 ///< Timer counter (in GP task intervals) counts time spent in re-circulation sub-mode.
 static U32  recircPublishTimerCtr;                                          ///< Timer counter (in GP task intervals) counts time to next status broadcast.
 
-static BOOL recircStopRequested;                                            ///< Flag indicates alarm requesting to stop rinseback.
 static BOOL recircReconnectRequested;                                       ///< Flag indicates user requesting re-circulate stop so they can re-connect.
 static BOOL recircBackToTreatmenRequested;                                  ///< Flag indicates user requesting to go back to treatment (confirming re-connected).
 static BOOL recircResumeRequested;                                          ///< Flag indicates user requesting resumption of re-circulating.
@@ -96,7 +95,6 @@
  *************************************************************************/
 static void resetTreatmentRecircFlags( void )
 {
-    recircStopRequested = FALSE;
     recircReconnectRequested = FALSE;
     recircBackToTreatmenRequested = FALSE;
     recircResumeRequested = FALSE;
@@ -221,7 +219,7 @@
     TREATMENT_RECIRC_STATE_T result = TREATMENT_RECIRC_RECIRC_STATE;
 
     // Is alarm stop or user reconnect requested?
-    if ( ( TRUE == recircStopRequested ) || ( TRUE == recircReconnectRequested ) )
+    if ( ( TRUE == recircReconnectRequested ) || ( TRUE == doesAlarmStatusIndicateStop() ) )
     {
         setupForRecirculationStopState();
         result = TREATMENT_RECIRC_STOPPED_STATE;
@@ -282,19 +280,6 @@
 
 /*********************************************************************//**
  * @brief
- * The signalStopTreatmentRecirc function signals the treatment re-circulate
- * sub-mode to stop per an active alarm.
- * @details Inputs: none
- * @details Outputs: recircStopRequested
- * @return none
- *************************************************************************/
-void signalStopTreatmentRecirc( void )
-{
-    recircStopRequested = TRUE;
-}
-
-/*********************************************************************//**
- * @brief
  * The signalTreatmentRecircUserAction function signals a re-circ user action
  * has been requested.  The request is handled and responded to.
  * @details Inputs: none