Index: dialin/dg/chemical_disinfect.py
===================================================================
diff -u -r26c7b6057f11680681e0a25399b5e5be9b92818d -r0cf6faaa1773d0f95a08db43cf3b47aef7749eaa
--- dialin/dg/chemical_disinfect.py	(.../chemical_disinfect.py)	(revision 26c7b6057f11680681e0a25399b5e5be9b92818d)
+++ dialin/dg/chemical_disinfect.py	(.../chemical_disinfect.py)	(revision 0cf6faaa1773d0f95a08db43cf3b47aef7749eaa)
@@ -50,7 +50,6 @@
         self.cancellation_mode = 0
         self.r1_level = 0
         self.r2_level = 0
-        self.chemical_disinfect_ui_state = 0
         self.dg_chem_disinfect_data_timestamp = 0.0
         self.dg_chem_disinfect_time_timestamp = 0.0
 
@@ -80,7 +79,6 @@
         self.cancellation_mode = 0
         self.r1_level = 0
         self.r2_level = 0
-        self.chemical_disinfect_ui_state = 0
 
     @publish(["dg_chem_disinfect_time_timestamp","chemical_disinfect_elapsed_time", "chemical_disinfect_target_time"])
     def _handler_chemical_disinfect_to_ui_sync(self, message, timestamp=0.0):
@@ -101,7 +99,7 @@
         self.dg_chem_disinfect_time_timestamp = timestamp
 
     @publish(["dg_chem_disinfect_data_timestamp", "chemical_disinfect_state", "overall_elapsed_time", "state_elapsed_time",
-              "cancellation_mode", "r1_level", "r2_level", "chemical_disinfect_ui_state"])
+              "cancellation_mode", "r1_level", "r2_level"])
     def _handler_chemical_disinfect_sync(self, message, timestamp = 0.0):
         """
         Handles published chemical disinfect message
@@ -120,15 +118,13 @@
         r2, index = bytearray_to_float(payload, index, False)
         target_post_rinse_cnt, index = bytearray_to_integer(payload, index, False)
         current_post_rinse_cnt, index = bytearray_to_integer(payload, index, False)
-        chem_ui_state, index = bytearray_to_integer(payload, index, False)
 
         self.chemical_disinfect_state = state
         self.overall_elapsed_time = int(elapsed_time / 1000)
         self.state_elapsed_time = int(state_elapsed_time / 1000)
         self.cancellation_mode = cancellation_mode
         self.r1_level = r1
         self.r2_level = r2
-        self.chemical_disinfect_ui_state = chem_ui_state
         self.dg_chem_disinfect_data_timestamp = timestamp
 
     def get_chem_disinfect_target_time(self) -> int:
@@ -211,10 +207,3 @@
         """
         return self.current_post_rinse_count
 
-    def get_chem_disinfect_chemical_disinfect_ui_state(self) -> int:
-        """
-        Gets Chemical Disinfection UI state
-
-        @return: (int)
-        """
-        return self.chemical_disinfect_ui_state
Index: tests/dg_tests.py
===================================================================
diff -u -r26c7b6057f11680681e0a25399b5e5be9b92818d -r0cf6faaa1773d0f95a08db43cf3b47aef7749eaa
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 26c7b6057f11680681e0a25399b5e5be9b92818d)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 0cf6faaa1773d0f95a08db43cf3b47aef7749eaa)
@@ -74,13 +74,12 @@
 
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, '
             'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, '
-            'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, '
+            'Total_rinse_count, {}, Top_alarm, {}, '
             .format(state, overall_elapsed_time, state_elapsed_time,
                     dg.chemical_disinfect.chemical_disinfect_target_time,
                     ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level,
                     dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count,
                     dg.chemical_disinfect_flush.rinse_count,
-                    DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name,
                     hd.alarms.alarm_top))
     return info
 
@@ -569,10 +568,10 @@
 def run_chemical_disinfect():
     complete_counter = 1
     f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w")
-    #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect()
+    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect()
     #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush()
 
-    dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value)
+    #dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value)
 
     try:
         while True:
@@ -726,7 +725,7 @@
 
     #run_flush_mode()
 
-    #run_chemical_disinfect()
+    run_chemical_disinfect()
 
     #hd.alarms.cmd_alarm_state_override(301, 1)
     #dg.ro_permeate_sample.cmd_send_hd_dg_is_ready_to_dispense()
@@ -748,9 +747,9 @@
     #    print(get_dg_valves_states())
     #    sleep(1)
 
-    while True:
-        print(dg.rtc.get_rtc_epoch(), hd.rtc.get_rtc_epoch())
-        sleep(1)
+    #while True:
+    #    print(dg.rtc.get_rtc_epoch(), hd.rtc.get_rtc_epoch())
+    #    sleep(1)
 
     #ui = HDSimulator()
     #ui.cmd_send_hd_operation_mode(3, 1)
Index: tests/test_nelson_labs_disinfect.py
===================================================================
diff -u -r821d2c94ccc6542a7733a9453e59b751bfd0ef75 -r0cf6faaa1773d0f95a08db43cf3b47aef7749eaa
--- tests/test_nelson_labs_disinfect.py	(.../test_nelson_labs_disinfect.py)	(revision 821d2c94ccc6542a7733a9453e59b751bfd0ef75)
+++ tests/test_nelson_labs_disinfect.py	(.../test_nelson_labs_disinfect.py)	(revision 0cf6faaa1773d0f95a08db43cf3b47aef7749eaa)
@@ -63,13 +63,11 @@
 
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, '
             'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, '
-            'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, '
+            'Total_rinse_count, {}, Top_alarm, {}, '
             .format(state, overall_elapsed_time, state_elapsed_time,
-                    dg.chemical_disinfect.chemical_disinfect_elapsed_time,
+                    dg.chemical_disinfect.chemical_disinfect_target_time,
                     ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level,
-                    dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0,
-                    DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name,
-                    hd.alarms.alarm_top))
+                    dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0, hd.alarms.alarm_top))
     return info
 
 
@@ -320,8 +318,8 @@
 
     #run_nelson_drain_samples()
 
-    run_nelson_heat_positive_control()
+    #run_nelson_heat_positive_control()
 
-    run_nelson_heat_disinfect()
+    #run_nelson_heat_disinfect()
 
-    #run_nelson_chem_disinfect()
\ No newline at end of file
+    run_nelson_chem_disinfect()
\ No newline at end of file