Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -re7ddd5bebe2e455e77337b485d17ccf1d26c395d
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp	(.../VTDTreatmentStatesData.cpp)	(revision e7ddd5bebe2e455e77337b485d17ccf1d26c395d)
@@ -68,13 +68,11 @@
     ENUM_CHECK_O( GuiSalineStates, vData.mSalineState                                               ) {
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                                           )
     ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE                            )
-    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE                             )
-    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE                          )
+    ENUM_CHECK  ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE                             )
     ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES                                        ) }
     ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE                   , sbIdle                );
     ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE    , sbWaitPump            );
-    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE     , sbRunning             );
-    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE  , sbSubstitutionRunning );
+    ENUM_READ   ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE     , sbRunning             );
 
     // Heparin States
     _heparin                = false;
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -re7ddd5bebe2e455e77337b485d17ccf1d26c395d
--- sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision e7ddd5bebe2e455e77337b485d17ccf1d26c395d)
@@ -75,7 +75,6 @@
     PROPERTY( bool   , sbIdle                   , true ) ///< SALINE_BOLUS_STATE_IDLE                   = 0  # No saline bolus delivery is in progress
     PROPERTY( bool   , sbWaitPump               , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    = 1  # Wait for pumps to stop before starting bolus
     PROPERTY( bool   , sbRunning                , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS            = 2  # A saline bolus delivery is in progress
-    PROPERTY( bool   , sbSubstitutionRunning    , false) ///< FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE   = 3  # A substitution delivery is in progress
 
     // ---- Heparin states
     PROPERTY( bool   , hpOff                    , true ) ///< HEPARIN_STATE_OFF                         = 0  # No heparin delivery is in progress