Index: sources/model/hd/alarm/MAlarmStatusData.cpp
===================================================================
diff -u -r7ea7c11017360fb77139994a9a8d3bb9b650304d -r4af6dcfa0281dc27714a26514e82bf3def901b5a
--- sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision 7ea7c11017360fb77139994a9a8d3bb9b650304d)
+++ sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision 4af6dcfa0281dc27714a26514e82bf3def901b5a)
@@ -122,7 +122,7 @@
     case GuiAlarmID::ALARM_ID_VALVE_CONTROL_FAILURE                             : { result = QObject::tr("FPGA not accepting commanded valve states."                                                                           ); break; }
     case GuiAlarmID::ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK              : { result = QObject::tr("Blood pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed."             ); break; }
     case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK            : { result = QObject::tr("Dialysate inlet pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed."   ); break; }
-    case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK           : { result = QObject::tr("Dialysate outlet pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed."  ); break; }
+    //// TODO: Has been removed // case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_FLOW_VS_MOTOR_SPEED_CHECK           : { result = QObject::tr("Dialysate outlet pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed."  ); break; }
     case GuiAlarmID::ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK                      : { result = QObject::tr("Blood pump failed motor speed check.  Measured vs. commanded."                                                        ); break; }
     case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK                    : { result = QObject::tr("Dialysate inlet pump failed motor speed check.  Measured vs. commanded."                                              ); break; }
     case GuiAlarmID::ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK                   : { result = QObject::tr("Dialysate outlet pump failed motor speed check.  Measured vs. commanded."                                             ); break; }
@@ -170,7 +170,7 @@
     case GuiAlarmID::ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME                     : { result = QObject::tr("DG dialysate fill runs out of time"                                                                                   ); break; }
     case GuiAlarmID::ALARM_ID_CP1_SPEED_CONTROL_ERROR                           : { result = QObject::tr("DG concentrate pump CP1 speed control error"                                                                          ); break; }
     case GuiAlarmID::ALARM_ID_CP2_SPEED_CONTROL_ERROR                           : { result = QObject::tr("DG concentrate pump CP2 speed control error"                                                                          ); break; }
-    case GuiAlarmID::ALARM_ID_FLOW_RATE_OUT_OF_RANGE                            : { result = QObject::tr("DG flow rate out of range"                                                                                            ); break; }
+    //// TODO: Has been removed // case GuiAlarmID::ALARM_ID_FLOW_RATE_OUT_OF_RANGE                            : { result = QObject::tr("DG flow rate out of range"                                                                                            ); break; }
     case GuiAlarmID::ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE                     : { result = QObject::tr("DG RO pump pressure out of range"                                                                                     ); break; }
     case GuiAlarmID::ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE                       : { result = QObject::tr("DG drain pump RPM out of range"                                                                                       ); break; }
     case GuiAlarmID::ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE     : { result = QObject::tr("DG heaters cold junction temperature out of range"                                                                    ); break; }
Index: sources/view/hd/data/VHDTreatmentStatesData.cpp
===================================================================
diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r4af6dcfa0281dc27714a26514e82bf3def901b5a
--- sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
+++ sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 4af6dcfa0281dc27714a26514e82bf3def901b5a)
@@ -78,12 +78,12 @@
     txDialysis_End          ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_DIALYSIS_END_STATE              );
     // Treatment states - Rinse back
     txRinseback_Running     ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RINSEBACK_STATE                 );
-    txRinseback_Pause       ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RINSEBACK_PAUSE_STATE           );
+    //// TODO: Has been removed // txRinseback_Pause       ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RINSEBACK_PAUSE_STATE           );
     // Treatment states - Recirculate
-    txRecirculate_Setup     ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_SETUP_STATE              );
+    //// TODO: Has been removed // txRecirculate_Setup     ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_SETUP_STATE              );
     txRecirculate_Running   ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_STATE                    );
-    txRecirculate_Pause     ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_PAUSE_STATE              );
-    txRecirculate_Stop      ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_STOP_STATE               );
+    //// TODO: Has been removed // txRecirculate_Pause     ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_PAUSE_STATE              );
+    //// TODO: Has been removed // txRecirculate_Stop      ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_STOP_STATE               );
 }
 
 /*!