Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r43d1739837a207e6d4d2960f3f0442af85b22a8c -r9e1b9e39a5723fd9f49b5257e8516022a4bc0229
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 43d1739837a207e6d4d2960f3f0442af85b22a8c)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 9e1b9e39a5723fd9f49b5257e8516022a4bc0229)
@@ -1,7 +1,4 @@
 
-
-// TODO the copyright will be added automatically
-
 #include <math.h>    // For reservoir management calculations
 
 #include "DGInterface.h"
@@ -75,11 +72,6 @@
 
 static const F32 RESERVOIR_DILUTION_RATIO = MAX_RESERVOIR_DILUTION / ( 1.0 - MAX_RESERVOIR_DILUTION );   ///< Reservoir dilution ratio.
 
-// TODO remove
-// FALSE for reservoir 1 and TRUE for reservoir 2
-static BOOL test = TRUE;
-// TODO remove
-
 // ********** private function prototypes **********
 
 // Reservoir management functions
@@ -610,38 +602,22 @@
         rsrvrCmd.reservoirID            = (U32)inactiveRes;
         rsrvrCmd.useLastTrimmerHeaterDC = TRUE;
 
-        // TODO test code remove
-        //if ( TRUE == test ) // TODO comment the if statement
-        {
-            // Signal dialysis sub-mode to capture baseline volume for next reservoir.
-            setStartReservoirVolume( inactiveRes );
+        // Signal dialysis sub-mode to capture baseline volume for next reservoir.
+        setStartReservoirVolume( inactiveRes );
 
-            // Command DG to switch reservoirs
-            cmdSetDGActiveReservoir( &rsrvrCmd );
+        // Command DG to switch reservoirs
+        cmdSetDGActiveReservoir( &rsrvrCmd );
 
-            // Signal dialysis sub-mode to switch reservoirs
-            signalReservoirsSwitched();
-        }
-        // TODO test code
+        // Signal dialysis sub-mode to switch reservoirs
+        signalReservoirsSwitched();
 
         // Get ready for the next delivery
         volSpentML = 0.0;
 
         // Wait for used reservoir to settle
         reservoirSwitchStartTimeMS = getMSTimerCount();
 
-        // TODO test code
-        // For reservoir test, it should go back to start state
-        /*if ( FALSE == test )
-        {
-            state = TREATMENT_RESERVOIR_MGMT_START_STATE;
-        }
-        else*/ // TODO comment the code above it is test code
-        {
-            state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE;
-            test = FALSE;
-        }
-        // TODO test code
+        state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE;
     }
 
     return state;