Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r765a17e8b525704386d48df1431688b07b785b40 -r60193b56d5b3a67801644008b9db8ee8e3916c31
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 765a17e8b525704386d48df1431688b07b785b40)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
@@ -173,7 +173,7 @@
 
     if ( TRUE == stop )
     {
-        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+        //activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
     }
 
     // execute mode state machine
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r44a100f8e5210a02c23b8fcc4527d8e96d577381 -r60193b56d5b3a67801644008b9db8ee8e3916c31
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
@@ -112,7 +112,7 @@
 #ifndef RUN_WITHOUT_DG
     if ( TRUE == stop )
     {
-        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER ); // TODO - remove alarm?  Nothing to stop here.
+        //activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER ); // TODO - remove alarm?  Nothing to stop here.
     }
 
     // State machine to get DG to prep a reservoir so we can start a treatment
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r6f2218c22e666aec059afbd60f3d0d268b305ad0 -r60193b56d5b3a67801644008b9db8ee8e3916c31
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6f2218c22e666aec059afbd60f3d0d268b305ad0)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
@@ -555,7 +555,7 @@
 
     if ( TRUE == stop )
     {
-        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+        //activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
     }
 
     // Treatment mode state machine
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r5abcde7ced011bf45febf2e4d052d155e512fa4d -r60193b56d5b3a67801644008b9db8ee8e3916c31
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 5abcde7ced011bf45febf2e4d052d155e512fa4d)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
@@ -812,7 +812,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+        //activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r85a18ee758116bb8e19b80b18f166a691a464bb7 -r60193b56d5b3a67801644008b9db8ee8e3916c31
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 85a18ee758116bb8e19b80b18f166a691a464bb7)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
@@ -117,7 +117,7 @@
         }
         else
         {
-            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+            //activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
         }
         // coming back to stop state via non-alarm path, so no audio - just want alarm for its options
         signalAlarmSilence( ALARM_SILENCE_CMD_CANCEL );