Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rbad0628d7a6484bfa8a550fd2a589f56d0a6c53d -r31481e4f25690883eafdf521a42170f9ae85e0ab
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision bad0628d7a6484bfa8a550fd2a589f56d0a6c53d)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 31481e4f25690883eafdf521a42170f9ae85e0ab)
@@ -46,11 +46,6 @@
 /// Interval (ms/task time) at which the post-treatment state data is published on the CAN bus.
 #define POST_TREATMENT_DATA_PUB_INTERVAL        ( 250 / TASK_GENERAL_INTERVAL )
 
-#define EMPTY_RESERVOIR_VOLUME_ML               0                           ///< Empty reservoir volume in ml.
-#define DIP_FLUSH_FLOW_RATE_ML_MIN              150                         ///< Dialysate inlet pump flow rate during flush in mL/min.
-
-#define LOAD_CELL_VOLUME_NOISE_TOLERANCE_GRAMS  10.0                        ///< Allowed tolerance on load cell readings when empty in grams.
-
 /// Post-Treatment drain reservoirs state machine.
 typedef enum Drain_States
 {
@@ -486,7 +481,7 @@
         }
         else
         {
-            cmdStartDGDrain( EMPTY_RESERVOIR_VOLUME_ML, FALSE );
+            cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, FALSE );
         }
     }
 
@@ -508,7 +503,7 @@
     if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
     {
         state = DRAIN_FIRST_RESERVOIR_STATE;
-        cmdStartDGDrain( EMPTY_RESERVOIR_VOLUME_ML, FALSE );
+        cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, FALSE );
     }
 
     return state;
@@ -566,7 +561,7 @@
     if ( TRUE == hasDGCompletedReservoirSwitch() )
     {
         state = DRAIN_SECOND_RESERVOIR_STATE;
-        cmdStartDGDrain( EMPTY_RESERVOIR_VOLUME_ML, FALSE );
+        cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, FALSE );
     }
 
     return state;