Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h
===================================================================
diff -u -rc3fb36648391c5b7738adfd0062ad2ac0b8e4749 -r00a8328d166a8a8a0f47e0d19b38396dbaaf06ae
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision c3fb36648391c5b7738adfd0062ad2ac0b8e4749)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision 00a8328d166a8a8a0f47e0d19b38396dbaaf06ae)
@@ -41,19 +41,13 @@
     TRIGGER ( bool   , state                                    , false ) // changes in case any message received.
 
     PROPERTY( quint8 , subMode                                  ,     0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
-    PROPERTY( quint8 , waterSampleState                         ,     0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
-    PROPERTY( quint8 , selfTestConsumablesState                 ,     0 ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,     , Consumable self-tests state
-    PROPERTY( quint8 , selfTestNoCartridgeState                 ,     0 ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE         , Self tests with no cartridge state
     PROPERTY( quint8 , installationState                        ,     0 ) ///< HD_PRE_TREATMENT_CART_INSTALL_STATE              , Consumable and cartridge installation state
     PROPERTY( quint8 , selfTestDryState                         ,     0 ) ///< HD_PRE_TREATMENT_SELF_TEST_DRY_STATE             , Self tests dry state
     PROPERTY( quint8 , primeState                               ,     0 ) ///< HD_PRE_TREATMENT_PRIME_STATE                     , Prime blood and dialysate circuits and run wet self-tests state
     PROPERTY( quint8 , recirculateState                         ,     0 ) ///< HD_PRE_TREATMENT_RECIRCULATE_STATE               , Re-circulate blood and dialysate circuits state
     PROPERTY( quint8 , patientConnectionState                   ,     0 ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE        , Patient connection state
-    PROPERTY( quint8 , wetSelfTestsState                        ,     0 ) ///< ???                                              , ???
-    PROPERTY( quint8 , preTreatmentRsrvrState                   ,     0 ) ///< ???                                              , ???
 
     // Start pre-treatment mode state
-    PROPERTY( bool   , waterSample                              , false ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
     PROPERTY( bool   , selfTestConsumables                      , false ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,     , Consumable self-tests state
     PROPERTY( bool   , selfTestNoCartridge                      , false ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE         , Self tests with no cartridge state
     PROPERTY( bool   , installation                             , false ) ///< HD_PRE_TREATMENT_CART_INSTALL_STATE              , Consumable and cartridge installation state
@@ -62,26 +56,7 @@
     PROPERTY( bool   , recirculate                              , false ) ///< HD_PRE_TREATMENT_RECIRCULATE_STATE               , Re-circulate blood and dialysate circuits state
     PROPERTY( bool   , patientConnection                        , false ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE        , Patient connection state
 
-    // Water sample state
-    PROPERTY( bool   , waterSample_setup                        , false ) ///< SAMPLE_WATER_SETUP_STATE                         , Sample water setup state of the sample water sub-mode state machine
-    PROPERTY( bool   , waterSample_running                      , false ) ///< SAMPLE_WATER_STATE                               , Sample water state of the sample water sub-mode state machine
 
-    // Self tests consumables state
-    PROPERTY( bool   , selfTestConsumables_install              , false ) ///< CONSUMABLE_SELF_TESTS_INSTALL_STATE              , Consumable self-tests install state
-    STATE   ( bool   , selfTestConsumables_prime                , false ) ///< CONSUMABLE_SELF_PRIME_STATE                      , Consumable self-tests prime concentrate lines state
-    STATE   ( bool   , selfTestConsumables_biCarbPump           , false ) ///< CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE    , Consumable self-tests bicarbonate concentrate pump check state
-    STATE   ( bool   , selfTestConsumables_acidPump             , false ) ///< CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE      , Consumable self-tests acid concentrate pump check state
-    STATE   ( bool   , selfTestConsumables_complete             , false ) ///< CONSUMABLE_SELF_TESTS_COMPLETE_STATE             , Consumable self-tests complete state
-
-    PROPERTY( bool   , selfTestNoCartridge_waitDoorClose        , false ) ///< NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE     , Wait for door to be closed before running self-tests.
-    PROPERTY( bool   , selfTestNoCartridge_pressureCheck        , false ) ///< NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE         , No cartridge pressure sensors self-test state
-    PROPERTY( bool   , selfTestNoCartridge_homeValves           , false ) ///< NO_CART_SELF_TESTS_HOME_VALVES_STATE             , No cartridge home valves state
-    PROPERTY( bool   , selfTestNoCartridge_homeSyringePump      , false ) ///< NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE       , No cartridge home syringe pump state
-    PROPERTY( bool   , selfTestNoCartridge_pumps                , false ) ///< NO_CART_SELF_TESTS_PUMPS_STATE                   , No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state.
-    PROPERTY( bool   , selfTestNoCartridge_homeIdle             , false ) ///< NO_CART_SELF_TESTS_HOME_IDLE_STATE               , Wait for valves and pumps finish homing state.
-    PROPERTY( bool   , selfTestNoCartridge_stopped              , false ) ///< NO_CART_SELF_TESTS_STOPPED_STATE                 , No cart self-test stopped state.
-    PROPERTY( bool   , selfTestNoCartridge_complete             , false ) ///< NO_CART_SELF_TESTS_COMPLETE_STATE                , No cartridge self-test complete state.
-
     // Consumable and cartridge installation state
     // There is not state(enum) for this and it is always 0 for now. but will be used to notify UI about being in this state.
     PROPERTY( bool   , installation_start                       , false ) ///< Consumable and cartridge installation state