Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r9b831d8407ad2ac737a58f369455074306d5097a -r8cebc7f282f403c99f712d422454c15414b6fc73
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9b831d8407ad2ac737a58f369455074306d5097a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8cebc7f282f403c99f712d422454c15414b6fc73)
@@ -1146,18 +1146,6 @@
             handleDGTemperatureData( message );
             break;
 
-        case MSG_ID_RO_PUMP_DATA:
-            handleROPumpData( message );
-            break;
-
-        case MSG_ID_DG_PRESSURES_DATA:
-            handleDGPressuresData( message );
-            break;
-
-        case MSG_ID_DRAIN_PUMP_DATA:
-            handleDrainPumpData( message );
-            break;
-
         case MSG_ID_DG_OP_MODE:
             handleDGOpMode( message );
             break;
@@ -1515,16 +1503,14 @@
                 handleHDSoftwareResetRequest( message );
                 break;
 
-#ifdef USE_FMB_FLOW_SENSOR
-            case MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE:
-                handleTestBloodFlowSignalStrengthOverrideRequest( message );
+            case MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE:
+                handleHDBloodPumpRotorCountOverrideRequest( message );
                 break;
-#endif
-#ifdef USE_FMD_FLOW_SENSOR
-            case MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE:
-                handleTestDialInFlowSignalStrengthOverrideRequest( message );
+
+            case MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET:
+                handleHDSetArterialPressureOffsetRequest( message );
                 break;
-#endif
+
             case MSG_ID_BLOOD_PUMP_HOME_CMD:
                 handleTestBloodPumpHomeRequest( message );
                 break;