Index: HDDefs.h
===================================================================
diff -u -ra67ed2073a27618d3d35352fc897da0cbb75e515 -rd28027b83afa69852315c2c91383e3978fe11a63
--- HDDefs.h	(.../HDDefs.h)	(revision a67ed2073a27618d3d35352fc897da0cbb75e515)
+++ HDDefs.h	(.../HDDefs.h)	(revision d28027b83afa69852315c2c91383e3978fe11a63)
@@ -149,8 +149,9 @@
 /// Enumeration of sample water sub-mode states.
 enum HD_Pre_Treatment_Sample_Water_States
 {
-    SAMPLE_WATER_SETUP_STATE = 0,                               ///< Sample water setup state of the sample water sub-mode state machine
-    SAMPLE_WATER_STATE,                                         ///< Sample water state of the sample water sub-mode state machine
+    SAMPLE_WATER_SETUP_STATE = 0,                               ///< Sample water setup (flush filter) state
+    SAMPLE_WATER_STATE,                                         ///< Sample water state, receiving sample water commands from the user
+    SAMPLE_WATER_COMPLETE_STATE,                                ///< Sample water complete state
     NUM_OF_SAMPLE_WATER_STATES                                  ///< Number of sample water sub-mode states
 };
 /// Type for sample water states enumeration.
Index: MsgDefs.h
===================================================================
diff -u -ra67ed2073a27618d3d35352fc897da0cbb75e515 -rd28027b83afa69852315c2c91383e3978fe11a63
--- MsgDefs.h	(.../MsgDefs.h)	(revision a67ed2073a27618d3d35352fc897da0cbb75e515)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision d28027b83afa69852315c2c91383e3978fe11a63)
@@ -139,9 +139,6 @@
     MSG_ID_DG_FLUID_LEAK_STATE = 0x6B,                                  ///< DG broadcast of fluid leak state
     MSG_ID_HD_BLOOD_LEAK_STATE = 0x6C,                                  ///< HD broadcast of blood leak state
 
-    // TODO - test msg - remove later
-    MSG_ID_DG_LOAD_CELL_RAW_DATA_BROADCAST = 0x998,
-
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
 #endif