Index: dialin/dg/heaters.py
===================================================================
diff -u -reb5e1db6feb04feb5eb5ac5cf3251b6e4f8e94ff -r6b31cabf55084262b258446a82090bacdb4ad52a
--- dialin/dg/heaters.py	(.../heaters.py)	(revision eb5e1db6feb04feb5eb5ac5cf3251b6e4f8e94ff)
+++ dialin/dg/heaters.py	(.../heaters.py)	(revision 6b31cabf55084262b258446a82090bacdb4ad52a)
@@ -145,7 +145,6 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
         self.trimmer_calc_target_temperature = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
-        # TODO Yes Behrouz, I know.
         self.trimmer_use_last_duty_cycle = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0]
 
Index: dialin/dg/valves.py
===================================================================
diff -u -raf831f536411facc3ad088d94a79643429288d16 -r6b31cabf55084262b258446a82090bacdb4ad52a
--- dialin/dg/valves.py	(.../valves.py)	(revision af831f536411facc3ad088d94a79643429288d16)
+++ dialin/dg/valves.py	(.../valves.py)	(revision 6b31cabf55084262b258446a82090bacdb4ad52a)
@@ -320,16 +320,13 @@
         self.valve_states_enum[self.VALVE_RESERVOIR_DRAIN_2] = VPiVSPVBfVRD1VRD2States(self._binary_to_valve_state(vst[0] & 2048)).name     # VRD2
         self.valve_states_enum[self.VALVE_PRODUCTION_DRAIN] = VPdStates(self._binary_to_valve_state(vst[0] & 4096)).name    # VPD
 
-        # TODO Yes Behrouz, I will switch to the new method with automation scripts! No not immediately Behrouz.
-        #  Dude this is an improvement hold on, it won't be ready immediately
         start = self.END_POS_VALVES_STATES
         end = start + 1
         for valve_id in self.valves_sensed_states:
             valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0]
             self.valves_sensed_states[valve_id] = DGValvesSensedStates(valve_state_number).name
             start = end
             end += 1
-        # TODO Behrouz thanks for reminding me, I will work on it!
 
     def cmd_valve_sensed_state_override(self, valve: int, state: bool, reset: int = NO_RESET) -> int:
         """
@@ -346,7 +343,7 @@
         valve IDs: \n
             0 = Valve Reservoir Fill \n
             1 = Valve Reservoir Inlet \n
-            2 = Valve Reservoir Drain \n
+            2 = Rserved Space \n
             3 = Valve Reservoir Outlet \n
             4 = Valve Pressure Outlet \n
             5 = Valve Bypass Filter \n