Index: tools/Code_Report.csv
===================================================================
diff -u -r16ca0157eb87633f1e04612e0708604ac0f0f0f2 -ra6859406e667a884fce356dd3feff93cad69b529
--- tools/Code_Report.csv	(.../Code_Report.csv)	(revision 16ca0157eb87633f1e04612e0708604ac0f0f0f2)
+++ tools/Code_Report.csv	(.../Code_Report.csv)	(revision a6859406e667a884fce356dd3feff93cad69b529)
@@ -1703,7 +1703,6 @@
 common/hd_defs.py, Enum, HDInitStates, POST_STATE_FAILED
 common/hd_defs.py, Enum, HDInitStates, NUM_OF_POST_STATES
 common/hd_defs.py, Enum, PreTreatmentSubModes, PreTreatmentSubModes
-common/hd_defs.py, Enum, PreTreatmentSubModes, HD_PRE_TREATMENT_START_STATE
 common/hd_defs.py, Enum, PreTreatmentSubModes, HD_PRE_TREATMENT_WATER_SAMPLE_STATE
 common/hd_defs.py, Enum, PreTreatmentSubModes, HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE
 common/hd_defs.py, Enum, PreTreatmentSubModes, HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE
@@ -1720,14 +1719,12 @@
 common/hd_defs.py, Enum, PreTreatmentSampleWaterStates, NUM_OF_SAMPLE_WATER_STATES
 common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, PreTreatmentConsumableSelfTestStates
 common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, CONSUMABLE_SELF_TESTS_INSTALL_STATE
-common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, CONSUMABLE_SELF_TESTS_FILL_CMD_STATE
-common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE
+common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, CONSUMABLE_SELF_TESTS_PRIME_STATE
 common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE
 common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE
 common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, CONSUMABLE_SELF_TESTS_COMPLETE_STATE
 common/hd_defs.py, Enum, PreTreatmentConsumableSelfTestStates, NUM_OF_CONSUMABLE_SELF_TESTS_STATES
 common/hd_defs.py, Enum, PreTreatmentNoCartSelfTestStates, PreTreatmentNoCartSelfTestStates
-common/hd_defs.py, Enum, PreTreatmentNoCartSelfTestStates, NO_CART_SELF_TESTS_START_STATE
 common/hd_defs.py, Enum, PreTreatmentNoCartSelfTestStates, NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE
 common/hd_defs.py, Enum, PreTreatmentNoCartSelfTestStates, NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE
 common/hd_defs.py, Enum, PreTreatmentNoCartSelfTestStates, NO_CART_SELF_TESTS_HOME_VALVES_STATE
@@ -1739,8 +1736,8 @@
 common/hd_defs.py, Enum, PreTreatmentNoCartSelfTestStates, NUM_OF_NO_CART_SELF_TESTS_STATES
 common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, PreTreatmentWetSelfTestStates
 common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, WET_SELF_TESTS_START_STATE
-common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, WET_SELF_TESTS_SETUP_STATE
-common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, WET_SELF_TESTS_BUBBLES_STATE
+common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, WET_SELF_TESTS_BUBBLE_CHECK_SETUP_STATE
+common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, WET_SELF_TESTS_BUBBLE_CHECK_STATE
 common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, WET_SELF_TESTS_PRIME_CHECK_STATE
 common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE
 common/hd_defs.py, Enum, PreTreatmentWetSelfTestStates, WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE
@@ -1768,6 +1765,7 @@
 common/hd_defs.py, Enum, SyringePumpStates, SYRINGE_PUMP_INIT_STATE
 common/hd_defs.py, Enum, SyringePumpStates, SYRINGE_PUMP_OFF_STATE
 common/hd_defs.py, Enum, SyringePumpStates, SYRINGE_PUMP_RETRACT_STATE
+common/hd_defs.py, Enum, SyringePumpStates, SYRINGE_PUMP_PRELOAD_STATE
 common/hd_defs.py, Enum, SyringePumpStates, SYRINGE_PUMP_SEEK_STATE
 common/hd_defs.py, Enum, SyringePumpStates, SYRINGE_PUMP_PRIME_STATE
 common/hd_defs.py, Enum, SyringePumpStates, SYRINGE_PUMP_HEP_BOLUS_STATE
@@ -1793,7 +1791,7 @@
 common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_START_STATE
 common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE
 common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE
-common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE
+common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE
 common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE
 common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE
 common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS
@@ -1808,7 +1806,6 @@
 common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, DRY_SELF_TESTS_COMPLETE_STATE
 common/hd_defs.py, Enum, PreTreatmentDrySelfTestsStates, NUM_OF_DRY_SELF_TESTS_STATES
 common/hd_defs.py, Enum, PreTreatmentPrimeStates, PreTreatmentPrimeStates
-common/hd_defs.py, Enum, PreTreatmentPrimeStates, HD_PRIME_START_STATE
 common/hd_defs.py, Enum, PreTreatmentPrimeStates, HD_PRIME_WAIT_FOR_USER_START_STATE
 common/hd_defs.py, Enum, PreTreatmentPrimeStates, HD_PRIME_SALINE_SETUP_STATE
 common/hd_defs.py, Enum, PreTreatmentPrimeStates, HD_PRIME_SALINE_PURGE_AIR_STATE
@@ -1831,7 +1828,6 @@
 common/hd_defs.py, Enum, PreTreatmentPatientConnectionStates, PATIENT_CONNECTION_STATE
 common/hd_defs.py, Enum, PreTreatmentPatientConnectionStates, NUM_OF_PATIENT_CONNECTION_STATES
 common/hd_defs.py, Enum, TreatmentParametersStates, TreatmentParametersStates
-common/hd_defs.py, Enum, TreatmentParametersStates, HD_TREATMENT_PARAMS_MODE_STATE_START
 common/hd_defs.py, Enum, TreatmentParametersStates, HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND
 common/hd_defs.py, Enum, TreatmentParametersStates, HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_CONFIRM
 common/hd_defs.py, Enum, TreatmentParametersStates, NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES
@@ -1848,7 +1844,6 @@
 common/hd_defs.py, Enum, TreatmentBloodPrimeStates, BLOOD_PRIME_RAMP_STATE
 common/hd_defs.py, Enum, TreatmentBloodPrimeStates, NUM_OF_BLOOD_PRIME_STATES
 common/hd_defs.py, Enum, TreatmentDialysisStates, TreatmentDialysisStates
-common/hd_defs.py, Enum, TreatmentDialysisStates, DIALYSIS_START_STATE
 common/hd_defs.py, Enum, TreatmentDialysisStates, DIALYSIS_UF_STATE
 common/hd_defs.py, Enum, TreatmentDialysisStates, DIALYSIS_SALINE_BOLUS_STATE
 common/hd_defs.py, Enum, TreatmentDialysisStates, NUM_OF_DIALYSIS_STATES
@@ -1903,7 +1898,6 @@
 common/hd_defs.py, Enum, HDEventDataType, EVENT_DATA_TYPE_BOOL
 common/hd_defs.py, Enum, HDEventDataType, NUM_OF_EVENT_DATA_TYPES
 common/hd_defs.py, Enum, UFStates, UFStates
-common/hd_defs.py, Enum, UFStates, UF_START_STATE
 common/hd_defs.py, Enum, UFStates, UF_PAUSED_STATE
 common/hd_defs.py, Enum, UFStates, UF_RUNNING_STATE
 common/hd_defs.py, Enum, UFStates, NUM_OF_UF_STATES