Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -rd1abd0eba39f6eb00e7d1022628605cd45a63b32 -r2e7706d646b75803605cf0bc30375763bf999416
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision d1abd0eba39f6eb00e7d1022628605cd45a63b32)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 2e7706d646b75803605cf0bc30375763bf999416)
@@ -74,7 +74,6 @@
     dialysatePressure                       = 0.0F;
     isDialysateGoodtoDeliver                = FALSE;
 
-
     ddOpModeDataFreshFlag                   = FALSE;
     ddDialysatePressureFreshFlag            = FALSE;
 
Index: firmware/App/Services/DDInterface.h
===================================================================
diff -u -rd1abd0eba39f6eb00e7d1022628605cd45a63b32 -r2e7706d646b75803605cf0bc30375763bf999416
--- firmware/App/Services/DDInterface.h	(.../DDInterface.h)	(revision d1abd0eba39f6eb00e7d1022628605cd45a63b32)
+++ firmware/App/Services/DDInterface.h	(.../DDInterface.h)	(revision 2e7706d646b75803605cf0bc30375763bf999416)
@@ -51,7 +51,7 @@
 DD_OP_MODE_T getDDOpMode( void );
 U32  getDDSubMode( void );
 F32  getDialysatePressure( void );
-BOOL  getDialysateGoodToDeliverStatus( void );
+BOOL getDialysateGoodToDeliverStatus( void );
 
 BOOL setDDOpMode( MESSAGE_T *message );
 BOOL setDialysateData( MESSAGE_T *message );
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rd1abd0eba39f6eb00e7d1022628605cd45a63b32 -r2e7706d646b75803605cf0bc30375763bf999416
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision d1abd0eba39f6eb00e7d1022628605cd45a63b32)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2e7706d646b75803605cf0bc30375763bf999416)
@@ -106,6 +106,7 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                       &handleVersionRequestMessage },
     { MSG_ID_UI_CHECK_IN,                                               &handleUICheckIn },
     { MSG_ID_DD_OP_MODE_DATA,                                           &setDDOpMode },
+    { MSG_ID_DD_GEN_DIALYSATE_MODE_DATA,                                &setDialysateData },
     { MSG_ID_DD_PRESSURES_DATA,                                         &setDialysatePressure },
     { MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,                           &validateAndSetTreatmentParameters },
     { MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW,                            &signalUserInitiateTreatment },
@@ -183,7 +184,6 @@
     { MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE,                            &testBloodPrimeVolumeOverride },
     { MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,          &testBloodPrimePublishIntervalOverride },
     { MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM,                             &testEnableVenousBubbleAlarm },
-    { MSG_ID_DD_GEN_DIALYSATE_MODE_DATA,                                &setDialysateData },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
Index: firmware/App/TDCommon.h
===================================================================
diff -u -rd1abd0eba39f6eb00e7d1022628605cd45a63b32 -r2e7706d646b75803605cf0bc30375763bf999416
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision d1abd0eba39f6eb00e7d1022628605cd45a63b32)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 2e7706d646b75803605cf0bc30375763bf999416)
@@ -117,15 +117,6 @@
     U32 ctrlMode;                           ///< Control mode.
 } OVERRIDE_PUMP_SET_PT_PAYLOAD_T;
 
-/// 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;
-
 #pragma pack(pop)
 
 // **** Common Macros ****