Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r72bc0d5f33dbb07afc8a7cd9015e4861c6c371a1 -rfa58741ab8fbca9ad24e5f3929f41da510ee02ba
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 72bc0d5f33dbb07afc8a7cd9015e4861c6c371a1)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision fa58741ab8fbca9ad24e5f3929f41da510ee02ba)
@@ -7,16 +7,15 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Jashwant Gantyada
-* @date    (last)      22-Mar-2026
+* @author  (last)      Raghu Kallala
+* @date    (last)      06-Apr-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
 *
 ***************************************************************************/
 
 #include <string.h>        // For memcpy()
-
 #include "AirPump.h"
 #include "AirTrap.h"
 #include "AlarmMgmt.h"
@@ -26,6 +25,7 @@
 #include "Compatible.h"
 #include "CpldInterface.h"
 #include "DDInterface.h"
+#include "DrySelfTests.h"
 #include "Ejector.h"
 #include "FpgaTD.h"
 #include "LevelSensors.h"
@@ -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 },