Index: firmware/App/Monitors/Pressures.c
===================================================================
diff -u -re0d2ac9688850fd3ac560775391e2ca8198087d3 -r0ee7b6d35e1a493f6b3e644d037e95bcc06a84b0
--- firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision e0d2ac9688850fd3ac560775391e2ca8198087d3)
+++ firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision 0ee7b6d35e1a493f6b3e644d037e95bcc06a84b0)
@@ -200,7 +200,7 @@
 static U32 tmpPressureReadingsLongCount;                                        ///< Number of samples in flow rolling average buffer.
 
 static PRESSURE_SELF_TEST_STATE_T pressurePostState;                            ///< Pressure self test post state.
-//static HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord;               ///< Pressure sensors calibration record.
+//static HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord;             ///< Pressure sensors calibration record.
 
 // ********** private function prototypes **********
 
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -reecb28374ace291706f07816ba8c9f15e367cb4f -r0ee7b6d35e1a493f6b3e644d037e95bcc06a84b0
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision eecb28374ace291706f07816ba8c9f15e367cb4f)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0ee7b6d35e1a493f6b3e644d037e95bcc06a84b0)
@@ -108,8 +108,6 @@
     { MSG_ID_DD_OP_MODE_DATA,                                           &setDDOpMode },
     { MSG_ID_DD_PRESSURES_DATA,                                         &setDialysatePressure },
     { MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,                           &validateAndSetTreatmentParameters },
-    { MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE,                     &validateAndSetUFVolume },
-    { MSG_ID_UI_TREATMENT_PARAMS_CONFIRMED,                             &signalUserConfirmationOfTreatmentParameters },
     { MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW,                            &signalUserInitiateTreatment },
     { MSG_ID_UI_UF_PAUSE_RESUME_REQUEST,                                &signalPauseResumeUF },
     { MSG_ID_TESTER_LOGIN_REQUEST,                                      &handleTesterLogInRequest },
Index: firmware/App/TDCommon.h
===================================================================
diff -u -r100264e4a4f8aaa3dbf7cb37233e0738b842dd54 -r0ee7b6d35e1a493f6b3e644d037e95bcc06a84b0
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 100264e4a4f8aaa3dbf7cb37233e0738b842dd54)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 0ee7b6d35e1a493f6b3e644d037e95bcc06a84b0)
@@ -121,6 +121,8 @@
 
 // **** Common Macros ****
 
+#define BICARBONATE_CONVERSION_FACTOR    0.07337F    ///< Bicarbonate conversion factor mS/cm per mmol/L  //TODO move to institutional records and update the usage with get API call
+
 /**@}*/
 
 // **** VectorCAST Definitions ****