Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -re12eefac42a3806a34f3ddac6df30bbb5ca51f6f -r2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e12eefac42a3806a34f3ddac6df30bbb5ca51f6f)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b)
@@ -43,7 +43,7 @@
 
 static DD_STANDBY_MODE_STATE_T standbyState;                                              ///< Currently active standby state.
 
-static OVERRIDE_U32_T pendingStartDDPreGenRequest;                                        ///< Flag indicating TD has requested DD start the pre generation dialysate request(Overridable).
+static BOOL pendingStartDDPreGenRequest;                                                  ///< Flag indicating TD has requested DD start the pre generation dialysate request.
 static BOOL pendingBalanceChamberSwOnlyRequest;                                           ///< Flag indicating balancing chamber switch only request.
 //static BOOL pendingStartDDFlushRequest;                                                 ///< Flag indicating TD has requested DD start flush.
 //static BOOL pendingStartDDHeatDisinfectRequest;                                         ///< Flag indicating TD has requested DD start heat disinfect.
@@ -65,10 +65,7 @@
 void initStandbyMode( void )
 {
     standbyState                                 = DD_STANDBY_MODE_STATE_IDLE;
-    pendingStartDDPreGenRequest.data             = FALSE;
-    pendingStartDDPreGenRequest.ovData           = FALSE;
-    pendingStartDDPreGenRequest.ovInitData       = FALSE;
-    pendingStartDDPreGenRequest.override         = OVERRIDE_RESET;
+    pendingStartDDPreGenRequest                  = FALSE;
     pendingBalanceChamberSwOnlyRequest           = FALSE;
 //    pendingStartDDFlushRequest                   = FALSE;
 //    pendingStartDDHeatDisinfectRequest           = FALSE;
@@ -192,9 +189,9 @@
 //    {
             // define the alarm
 //    }
-    if ( TRUE == getU32OverrideValue( &pendingStartDDPreGenRequest ) )
+    if ( TRUE == pendingStartDDPreGenRequest )
     {
-        pendingStartDDPreGenRequest.data = FALSE;
+        pendingStartDDPreGenRequest = FALSE;
         requestNewOperationMode( DD_MODE_PREG );
     }
     //Test request to handle only balancing chamber switching
@@ -266,7 +263,7 @@
     if ( DD_STANDBY_MODE_STATE_IDLE == standbyState )
     {
         result                           = TRUE;
-        pendingStartDDPreGenRequest.data = TRUE;
+        pendingStartDDPreGenRequest      = TRUE;
     }
 
     return result;
@@ -507,21 +504,4 @@
  *************************************************************************/
 
 
-/*********************************************************************//**
- * @brief
- * The testDDStartPreGenDialysateOverride function sets the override value
- * to start the pre-gen dialysate operation mode.
- * @details Inputs: pendingStartDDPreGenRequest
- * @details Outputs: pendingStartDDPreGenRequest
- * @param message Override message from Dialin which includes the flag
- * to override the operation mode.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testDDStartPreGenDialysateOverride( MESSAGE_T *message )
-{
-    BOOL result = u32Override( message, &pendingStartDDPreGenRequest, FALSE, TRUE );
-
-    return result;
-}
-
 /**@}*/