Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rd42ac7ac0eabedbb7b1c721a18419df3ed8cc9fb -r89f4c7f0995e2094b3f26fc7e7e12371e847abac
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision d42ac7ac0eabedbb7b1c721a18419df3ed8cc9fb)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac)
@@ -610,12 +610,6 @@
 {
     TREATMENT_STATE_T result = TREATMENT_RINSEBACK_STATE;
 
-    // Handle alarm stoppage
-    if ( TRUE == doesAlarmStatusIndicateStop() )
-    {
-        signalStopRinseback();
-    }
-
     // Execute treatment re-circ sub-mode
     execRinseback();
 
@@ -651,12 +645,6 @@
 {
     TREATMENT_STATE_T result = TREATMENT_RECIRC_STATE;
 
-    // Handle alarm stoppage
-    if ( TRUE == doesAlarmStatusIndicateStop() )
-    {
-        signalStopTreatmentRecirc();
-    }
-
     // Execute treatment re-circ sub-mode
     execTreatmentRecirc();
 
@@ -687,23 +675,16 @@
 {
     TREATMENT_STATE_T result = TREATMENT_END_STATE;
 
-    // Handle alarm stoppage
-    if ( TRUE == doesAlarmStatusIndicateStop() )
+    // Handle final rinseback alarm response from user
+    if ( TRUE == initiateRinsebackAlarmResponseRequest )
     {
-        signalStopTreatmentEnd();
-    }
-    else if ( TRUE == initiateRinsebackAlarmResponseRequest )
-    {
         signalTreatmentEndAlarmRinsebackUserAction();
     }
+    // Handle alarm response from user to end treatment w/o rinseback
     else if ( TRUE == endTreatmentAlarmResponseRequest )
     {
         signalTreatmentEndAlarmEndTxUserAction();
     }
-    else if ( TRUE == resumeTreatmentAlarmResponseRequest )
-    {
-        signalTreatmentEndAlarmResumeUserAction();
-    }
 
     // Execute treatment end sub-mode
     execTreatmentEnd();