Index: AlarmDefs.h
===================================================================
diff -u -rad1bf61fca098fa6ce6ebd74c61d588cc7500fba -rcd07589027082929f8c94674d1d901e6f8de7235
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision ad1bf61fca098fa6ce6ebd74c61d588cc7500fba)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision cd07589027082929f8c94674d1d901e6f8de7235)
@@ -267,8 +267,6 @@
     ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 229,                    ///< HD no cartridge self-test timeout
     ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT = 230,                        ///< HD dry self-test timeout
     ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT = 231,                     ///< DG temperature sensor error flag fault.
-    ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION = 232,               ///< HD blood flow invalid calibration
-    ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION = 233,           ///< HD dialysate flow invalid calibration
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -508,7 +506,7 @@
     { ALARM_PRIORITY_HIGH,   999,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , TRUE,  FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM
     { ALARM_PRIORITY_HIGH,   999,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_DOOR_OPENED
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_AVAILABLE_4
-    { ALARM_PRIORITY_LOW,    999,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE
+    { ALARM_PRIORITY_LOW,    999,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE
     { ALARM_PRIORITY_LOW,    999,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY
     { ALARM_PRIORITY_MEDIUM, 999,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE
     { ALARM_PRIORITY_LOW,    999,   0,              ALARM_ID_NO_ALARM,                       FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_NO_CARTRIDGE_LOADED
@@ -611,8 +609,6 @@
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT
-    { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION
-    { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  FALSE }, // ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION
     // Priority              Rank   Escalate In     Escalate To                              Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
 };