Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rba7e088fc3308f844ea30376a78e1da6d32621c1 -r4fdac9edd409e97468c317e6c3c34dd5ac602410
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision ba7e088fc3308f844ea30376a78e1da6d32621c1)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 4fdac9edd409e97468c317e6c3c34dd5ac602410)
@@ -25,6 +25,7 @@
 #include "Heaters.h"
 #include "Level.h"
 #include "Messaging.h"
+#include "MessagePayloads.h"
 #include "ModeGenDialysate.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
Index: firmware/App/Modes/ModeGenDialysate.h
===================================================================
diff -u -r94789b2f2324d5901685b6ff7b6224d4af3a0276 -r4fdac9edd409e97468c317e6c3c34dd5ac602410
--- firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision 94789b2f2324d5901685b6ff7b6224d4af3a0276)
+++ firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision 4fdac9edd409e97468c317e6c3c34dd5ac602410)
@@ -37,15 +37,6 @@
 #define DIAL_PUMP_DRAIN_RPM                     1000                                        ///< Nominal RPM target for dialysate pump to drain the dry bicart.
 #define SPENT_DIAL_PUMP_FILL_RPM                200                                         ///< Nominal RPM target for spent chamber fill operations.
 
-/// Generate dialysate mode data structure
-typedef struct
-{
-    U32 genDialysateExecState;                          ///< Generate dialysate execution state
-    BOOL isDialDelInProgress;                           ///< Whether Dialysate Delivery in progress or not
-    BOOL isDialysateGoodtoDeliver;                      ///< Ready to deliver dialysate or not
-    F32 currentQd;                                      ///< Current dialysate flow rate (ml/min)
-} GEN_DIALYSATE_MODE_DATA_T;
-
 // ********** public function prototypes **********
 
 void initGenDialysateMode( void );                          // Initialize this gen dialysate mode unit
Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -r623587d96bf6c0bafd3ff94d47f8c783b4b999f0 -r4fdac9edd409e97468c317e6c3c34dd5ac602410
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 623587d96bf6c0bafd3ff94d47f8c783b4b999f0)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision 4fdac9edd409e97468c317e6c3c34dd5ac602410)
@@ -422,7 +422,8 @@
             // Update Temperature, Acid/Bicarb type and dialysate rate for pregen process.
             setTDDialysateFlowrate( startPreGenRequest.dialRate );
             setTDTargetDialysateTemperature( startPreGenRequest.dialTemp );
-            setTDAcidAndBicarbType( startPreGenRequest.acidType, startPreGenRequest.bicarbType );
+            //TODO : update latest staging code
+            //setTDAcidAndBicarbType( startPreGenRequest.acidType, startPreGenRequest.bicarbType );
         }
         else if ( DD_MODE_PREG == ddMode )
         {
@@ -478,7 +479,8 @@
             setTDTargetDialysateTemperature( startTxRequest.dialTemp );
 
             // Set concentrate types, Bypass dialyzer
-            setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
+            //TODO : update latest staging code
+            //setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
             setTDDialyzerBypass( startTxRequest.bypassDialyzer );
 
             // start dialysate generation
@@ -506,7 +508,8 @@
                 setTDTargetDialysateTemperature( startTxRequest.dialTemp );
 
                 // Set concentrate types, Bypass dialyzer
-                setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
+                //TODO : update latest staging code
+                //setTDAcidAndBicarbType( startTxRequest.acidType, startTxRequest.bicarbType );
                 setTDDialyzerBypass( startTxRequest.bypassDialyzer );
 
                 // Signal to update treatement parameters