Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rda0deea71ed5770d98a00943369b9c17321e139f -ra888f0f268896151a649da228f5a5119bbe2aa33
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision da0deea71ed5770d98a00943369b9c17321e139f)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision a888f0f268896151a649da228f5a5119bbe2aa33)
@@ -66,7 +66,6 @@
 #define ACID_PERCENT_FILL                        0.02222F                                              ///< Acid volume percentage of reservoir volume.
 #define DATA_PUBLISH_COUNTER_START_COUNT         70                                                    ///< Data publish counter start count.
 #define DRAIN_MODE_DATA_PUB_INTERVAL             ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )             ///< Interval (ms/task time) at which the drain mode data is published on the CAN bus.
-#define MIN_CONCENTRATE_VOLUME_ML                500.0F                                                ///< Minimum concentrate volume in milliliters.
 
 // ********** private data **********
 
@@ -276,18 +275,8 @@
     // if we have reached our target drain to volume (by weight) or cannot drain anymore, we are done draining - go back to generation idle mode
     if ( TRUE == drainStatus )
     {
-        DG_ACID_CONCENTRATES_RECORD_T acid;
-        F32 acidBottleVolML;
-        DG_BICARB_CONCENTRATES_RECORD_T bicarb;
-        F32 bicarbBottleVolML;
-
-        getAcidConcentrateCalRecord( &acid );
-        getBicarbConcentrateCalRecord( &bicarb );
         signalDrainPumpHardStop();
 
-        acidBottleVolML   = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidFullBottleVolumeML;
-        bicarbBottleVolML = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbStartVolumeML;
-
         if ( DG_RESERVOIR_1 == inactiveReservoir )
         {
             setValveState( VRD1, VALVE_STATE_CLOSED );
@@ -297,36 +286,6 @@
             setValveState( VRD2, VALVE_STATE_CLOSED );
         }
 
-#ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-        {
-            HD_MODE_SUB_MODE_T hdMode;
-
-            getHDOperationMode( &hdMode );
-
-            // Detect empty bottles using integrated volumes
-            if ( ( ( acidBottleVolML - getChemicalUsedVolumeML( ACID ) ) <= MIN_CONCENTRATE_VOLUME_ML ) && // SRSDG 836
-                 ( hdMode.hdMode != MODE_POST ) &&                            // don't care about concentrates after treatment complete
-                 ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
-            {
-                resetChemicalUsedVolumeML( ACID );
-                setThisFirstFillFlag( TRUE );                                 // indicates bottles need prime
-                activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
-                activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
-            }
-
-            if ( ( ( bicarbBottleVolML - getChemicalUsedVolumeML( BICARB ) ) <= MIN_CONCENTRATE_VOLUME_ML ) &&  // SRSDG 837
-                 ( hdMode.hdMode != MODE_POST ) &&                            // don't care about concentrates after treatment complete
-                 ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
-            {
-                resetChemicalUsedVolumeML( BICARB );
-                setThisFirstFillFlag( TRUE );
-                activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
-                activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
-            }
-        }
-
         if ( TRUE == isReservoirTarePending() )
         {   // Tare reservoir load cells at empty if requested
             result = DG_DRAIN_STATE_TARE;