Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -re9036ee8e37aa4f6709e6b3ad5578e2baa51c8f9 -r692ebee72e9c05976d1bea003a4922960c954d14
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e9036ee8e37aa4f6709e6b3ad5578e2baa51c8f9)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 692ebee72e9c05976d1bea003a4922960c954d14)
@@ -51,8 +51,7 @@
 #define BICARB_PUMP_40_ML_PER_MIN                       40.0                                                 ///< Bicarb pump speed of 40.0 mL/minute.
 
 #define DIALYSATE_FILL_TIME_OUT                         ( 5 * SEC_PER_MIN * MS_PER_SECOND )                  ///< Time out period when reservoir is not filled with correct dialysate.
-#define EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS        ( 5 * MS_PER_SECOND )                                ///< Persistent period for empty bottle detect.
-#define CONCENTRATE_BOTTLE_DETECT_PERSISTENT_PERIOD_MS  ( 1 * MS_PER_SECOND )                                ///< Persistent period for empty concentrate bottle detect.
+#define EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS        ( 1 * MS_PER_SECOND )                                ///< Persistent period for empty bottle detect.
 
 #define CONCENTRATE_PUMP_PRIME_INTERVAL                 ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )        ///< Persistent time interval for concentrate pumps prime.
 
@@ -179,12 +178,8 @@
     totalBicardConductivity    = 0.0;
     totalAcidConductivity      = 0.0;
 
-    initPersistentAlarm( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS );
-    initPersistentAlarm( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, 0, EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS );
-
-    initPersistentAlarm( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, CONCENTRATE_BOTTLE_DETECT_PERSISTENT_PERIOD_MS );
-    initPersistentAlarm( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME, 0, CONCENTRATE_BOTTLE_DETECT_PERSISTENT_PERIOD_MS );
-
+    initPersistentAlarm( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS );
+    initPersistentAlarm( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME, 0, EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS );
     initPersistentAlarm( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_DRFIT_TIMEOUT, 0, DIALYSATE_TEMPERATURE_SENSORS_DRIFT_TIMEOUT_MS );
 }
 
@@ -649,9 +644,6 @@
     BOOL isAcidConductivityBelowThreshold   = ( acidConductivity < CONDUCTIVITY_WHEN_ACID_JUG_EMPTY ? TRUE : FALSE );
     BOOL isBicarbConductivityBelowThreshold = ( bicarbConductivity < CONDUCTIVITY_WHEN_BICARB_JUG_EMPTY ? TRUE : FALSE );
 
-    BOOL isAcidConductivityOutOfRange   = isValueWithinPercentRange( acidConductivity, ACID_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR );
-    BOOL isBicarbConductivityOutOfRange = isValueWithinPercentRange( bicarbConductivity, BICARB_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR );
-
     // Set concentrate pumps speed based on the RO pump flow rate
     handleDialysateMixing( measuredROFlowRateMLPM );
 
@@ -677,24 +669,6 @@
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
         result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE;
     }
-
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, isAcidConductivityOutOfRange ) )  // SRSDG 558
-    {
-        usedAcidVolumeML.data = 0.0;
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
-        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-        result = DG_FILL_MODE_STATE_PAUSED;
-    }
-
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, isBicarbConductivityOutOfRange ) ) // SRSDG 630
-    {
-        usedBicarbVolumeML.data = 0.0;
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
-        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-        result = DG_FILL_MODE_STATE_PAUSED;
-    }
 #endif
 
 #ifndef DISABLE_MIXING