Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -re48bec7b1330b195afadcbf8bc58bdb4f1d5b03e -r8d2a2aec6986e58a1f6f75d4ba8864ee689fde48
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision e48bec7b1330b195afadcbf8bc58bdb4f1d5b03e)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 8d2a2aec6986e58a1f6f75d4ba8864ee689fde48)
@@ -52,8 +52,7 @@
 static BOOL pendingStopDDPreGenDialRequest;                                                                 ///< Flag indicating TD has requested DD stop the pre generation dialysate.
 static U32 preGenDialysatePublishTimerCounter;                                                              ///< Pre-Gen Dialysate data broadcast timer counter used to schedule when to transmit data.
 static OVERRIDE_U32_T preGenDialysateModePublishInterval;                                                   ///< Interval (in task intervals) at which to publish pre-gen dialysate mode data to CAN bus.
-static BOOL dryBicartFillRequest;
-static U32 StartTimeMS;
+
 // ********** private function prototypes **********
 
 static void publishPreGenDialysateState( void );
@@ -81,10 +80,8 @@
     wetSelfTestState                                = DD_WET_SELF_TEST_START;
     hydChamberPressureCheckStartTimeMS              = 0;
     pressureCheckPersistanceStartTimeMS             = 0;
-    StartTimeMS                                     = 0;
     pendingStartDDGenDialRequest                    = FALSE;
     pendingStopDDPreGenDialRequest                  = FALSE;
-    dryBicartFillRequest                            = FALSE;
     preGenDialysateModePublishInterval.data         = PRE_GEN_DIALYSATE_DATA_PUB_INTERVAL;
     preGenDialysateModePublishInterval.ovData       = PRE_GEN_DIALYSATE_DATA_PUB_INTERVAL;
     preGenDialysateModePublishInterval.ovInitData   = 0;
@@ -257,7 +254,6 @@
         setValveState( D14_VALV, VALVE_STATE_OPEN );
         setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
 
-        StartTimeMS = getMSTimerCount();
     }
 
     //execWetSelfTest();
@@ -277,21 +273,14 @@
 {
     //TODO: Change to wet self test state later
     DD_PRE_GEN_DIALYSATE_STATE_T state  = DD_PRE_GEN_DRY_BICART_FILL_CHECK;
-    U32 currentFillDurationInMS;
 
     if ( getTestConfigStatus( TEST_CONFIG_ENABLE_DRY_BICART_FILL ) == TRUE )
     {
-      //  if ( FALSE == dryBicartFillRequest )
-        {
-            setBicartFillRequested();
+        setBicartFillRequested();
 
-            dryBicartFillRequest = TRUE;
-        }
-
         if ( getCurrentDryBiCartFillExecState() == DRY_BICART_FILL_COMPLETE_STATE )
         {
-            currentFillDurationInMS =  calcTimeSince( StartTimeMS );
-            state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;
+             state   = DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND;
         }
     }
     else