Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -rc0445144841904d5a6ea9d37af639e138e6a86b0 -r08aa1ee4a1cc79526979153fa4759e1df3892203
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision c0445144841904d5a6ea9d37af639e138e6a86b0)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 08aa1ee4a1cc79526979153fa4759e1df3892203)
@@ -85,7 +85,6 @@
 static U32 primeStatusBroadcastTimerCounter;                                                    ///< Prime status data broadcast timer counter used to schedule when to transmit data.
 
 static BOOL primeStartRequested;                                                                ///< Flag indicates user requesting to start prime.
-static BOOL primeStopRequested;                                                                 ///< Flag indicates alarm requesting to stop prime.
 static BOOL primeResumeRequested;                                                               ///< Flag indicates user requesting prime resume.
 static BOOL reservoirFilledStatus[ NUM_OF_DG_RESERVOIRS ];                                      ///< Flag indicates a reservoir has been filled.
 
@@ -169,8 +168,6 @@
     switch ( currentPrimeState )
     {
         case HD_PRIME_START_STATE:
-            cmdStartDG();
-            cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
             cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
 #ifdef SKIP_PRIMING
             currentPrimeState = HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE;
@@ -304,19 +301,6 @@
 
 /*********************************************************************//**
  * @brief
- * The signalStopPrime function signals the prime sub-mode to stop when an
- * alarm with stop property has been triggered.
- * @details Inputs: none
- * @details Outputs: primeStopRequested
- * @return none
- *************************************************************************/
-void signalStopPrime( void )
-{
-    primeStopRequested = TRUE;
-}
-
-/*********************************************************************//**
- * @brief
  * The resetPrimeFlags function resets all prime signal flags.
  * @details Inputs: none
  * @details Outputs: signal flags set to FALSE
@@ -326,7 +310,6 @@
 {
     primeStartRequested = FALSE;
     primeResumeRequested = FALSE;
-    primeStopRequested = FALSE;
 }
 
 /*********************************************************************//**
@@ -338,13 +321,12 @@
  *************************************************************************/
 static void handlePrimePauseRequest( void )
 {
-    if ( ( TRUE == primeStopRequested ) && ( HD_PRIME_PAUSE != currentPrimeState ) )
+    if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( HD_PRIME_PAUSE != currentPrimeState ) )
     {
         signalDialOutPumpHardStop();
         signalDialInPumpHardStop();
         signalBloodPumpHardStop();
 
-        primeStopRequested  = FALSE;
         primePauseStartTime = getMSTimerCount();
         previousPrimeState  = currentPrimeState;
         currentPrimeState   = HD_PRIME_PAUSE;
@@ -773,16 +755,11 @@
 {
     HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_WET_SELF_TESTS_STATE;
 
-    if ( TRUE == primeStopRequested )
+    if ( TRUE == primeResumeRequested )
     {
         signalResumeSelfTests();
     }
 
-    if ( TRUE == primeResumeRequested )
-    {
-        signalStopSelfTests();
-    }
-
     execWetSelfTests();
 
     if ( TRUE == isWetSelfTestsPassed() )