Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
===================================================================
diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -r00a8328d166a8a8a0f47e0d19b38396dbaaf06ae
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision 64d551143d898bf2ce79cb564e5a3389eb9be91e)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision 00a8328d166a8a8a0f47e0d19b38396dbaaf06ae)
@@ -28,52 +28,12 @@
 void VPreTreatmentStates::onActionReceive(const PreTreatmentStatesData &vData)
 {
     subMode                 ( vData.mSubMode                    );
-    waterSampleState        ( vData.mWaterSampleState           );
-    selfTestConsumablesState( vData.mSelfTestConsumablesState   );
-    selfTestNoCartridgeState( vData.mSelfTestNoCartridgeState   );
     installationState       ( vData.mInstallationState          );
     selfTestDryState        ( vData.mSelfTestDryState           );
     primeState              ( vData.mPrimeState                 );
     recirculateState        ( vData.mRecirculateState           );
     patientConnectionState  ( vData.mPatientConnectionState     );
-    wetSelfTestsState       ( vData.mWetSelfTestsState          );
-    preTreatmentRsrvrState  ( vData.mPreTreatmentRsrvrState     );
 
-    // water sample state
-    bool mWaterSample                               = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_WATER_SAMPLE_STATE                ;
-    if ( mWaterSample ) {
-          waterSample_setup                         ( vData.mWaterSampleState           == GuiPreTreatmentWaterSampleStates         ::SAMPLE_WATER_SETUP_STATE                          );
-          waterSample_running                       ( vData.mWaterSampleState           == GuiPreTreatmentWaterSampleStates         ::SAMPLE_WATER_STATE                                );
-    }
-    waterSample( mWaterSample ); // it's the main even so moved last to have all the sub-states updated prior to.
-
-    // Self tests consumables state
-    bool mSelfTestConsumables                       = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE        ;
-    if ( mSelfTestConsumables ) {
-          selfTestConsumables_install               ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_INSTALL_STATE               );
-          selfTestConsumables_prime                 ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_PRIME_STATE                 );
-          selfTestConsumables_biCarbPump            ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE     );
-          selfTestConsumables_acidPump              ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE       );
-          selfTestConsumables_complete              ( vData.mSelfTestConsumablesState   == GuiPreTreatmentSelfTestConsumablesStates ::CONSUMABLE_SELF_TESTS_COMPLETE_STATE              );
-    }
-    selfTestConsumables(mSelfTestConsumables); // it's the main even so moved last to have all the sub-states updated prior to.
-
-
-    // Self tests with no cartridge state
-    bool mSelfTestNoCartridge                       = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE           ;
-    if ( mSelfTestNoCartridge ) {
-          selfTestNoCartridge_waitDoorClose         ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE     );
-          selfTestNoCartridge_pressureCheck         ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE         );
-          selfTestNoCartridge_homeValves            ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_STATE             );
-          selfTestNoCartridge_homeSyringePump       ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE       );
-          selfTestNoCartridge_pumps                 ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PUMPS_STATE                   );
-          selfTestNoCartridge_homeIdle              ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_IDLE_STATE               );
-          selfTestNoCartridge_stopped               ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_STOPPED_STATE                 );
-          selfTestNoCartridge_complete              ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_COMPLETE_STATE                );
-    }
-    selfTestNoCartridge(mSelfTestNoCartridge); // it's the main even so moved last to have all the sub-states updated prior to.
-
-
     // Consumable and cartridge installation state
     bool mInstallation                              = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE               ;
     if ( mInstallation ) {
@@ -82,7 +42,6 @@
     }
     installation(mInstallation); // it's the main even so moved last to have all the sub-states updated prior to.
 
-
     // Self tests dry state
     bool mSelfTestDry                               = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_SELF_TEST_DRY_STATE                   ;
     if ( mSelfTestDry ) {