Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8f4112033e1c247f629202cdc97389ffd5cb0170 -rd39ef6232e746a4f2d425135208602670fae60bd
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8f4112033e1c247f629202cdc97389ffd5cb0170)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d39ef6232e746a4f2d425135208602670fae60bd)
@@ -55,7 +55,7 @@
 #define MAX_COMM_CRC_FAILURES           5       ///< Maximum number of CRC errors within window period before alarm
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
 
-#define MSG_NOT_ACKED_TIMEOUT_MS        300     ///< Maximum time for a Denali message that requires ACK to be ACK'd
+#define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
 #define MSG_NOT_ACKED_MAX_RETRIES       3       ///< Maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
 #define PENDING_ACK_LIST_SIZE           25      ///< Maximum number of Denali messages that can be pending ACK at any given time
 
@@ -1146,22 +1146,10 @@
             handleDGTemperatureData( message );
             break;
 
-        case MSG_ID_RO_PUMP_DATA:
-            handleROPumpData( message );
-            break;
-
         case MSG_ID_DG_DIALYSATE_FLOW_METER_DATA:
             handleDialysateFlowData( 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;
@@ -1519,16 +1507,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;