Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -r8d2a2aec6986e58a1f6f75d4ba8864ee689fde48 -rf6b5a627c4f735ea5f425e0804defded0d6ed224
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 8d2a2aec6986e58a1f6f75d4ba8864ee689fde48)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision f6b5a627c4f735ea5f425e0804defded0d6ed224)
@@ -249,13 +249,6 @@
     //TODO: Change to wet self test state later
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_FILL_CHECK;
 
-    if ( getTestConfigStatus( TEST_CONFIG_ENABLE_DRY_BICART_FILL ) == TRUE )
-    {
-        setValveState( D14_VALV, VALVE_STATE_OPEN );
-        setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
-
-    }
-
     //execWetSelfTest();
 
     return state;
@@ -278,13 +271,15 @@
     {
         setBicartFillRequested();
 
+        // stay in this state till bicart fill complete.
         if ( getCurrentDryBiCartFillExecState() == DRY_BICART_FILL_COMPLETE_STATE )
         {
              state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;
         }
     }
     else
     {
+        // not bicart fill, move to next state
         state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;
     }