Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r14adcf33a5a509f27095a3a61cf45af61cd2baff -r84acaf1903111d7ad7225a8eab478b4ecd0e1bfb
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 14adcf33a5a509f27095a3a61cf45af61cd2baff)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 84acaf1903111d7ad7225a8eab478b4ecd0e1bfb)
@@ -44,9 +44,7 @@
         self.fp_temperature_sensors_timestamp = 0
         self.fp_temperatures = {
             FPTemperaturesNames.P10_TEMP.name: 0.0,
-            FPTemperaturesNames.P19_TEMP.name: 0.0,
-            FPTemperaturesNames.P7_TEMP.name: 0.0,
-            FPTemperaturesNames.P16_TEMP.name: 0.0
+            FPTemperaturesNames.P19_TEMP.name: 0.0
         }
 
     @publish(["msg_id_fp_temperature_data", "fp_temperatures", "fp_temperatures_timestamp"])
@@ -64,12 +62,6 @@
         self.fp_temperatures[FPTemperaturesNames.P19_TEMP.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-        self.fp_temperatures[FPTemperaturesNames.P7_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
-
-        self.fp_temperatures[FPTemperaturesNames.P16_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
-
         self.fp_temperature_sensors_timestamp = timestamp
 
     def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
@@ -125,16 +117,10 @@
         index = integer_to_bytearray(sensor_index)
         payload = rst + value + index
 
-        if sensor_index <= FPTemperaturesNames.P19_TEMP.value:
-            message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                                  message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST.value,
-                                                  payload=payload)
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
+                                              message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST.value,
+                                              payload=payload)
 
-        else: # the remaining sensors are flow sensors
-            message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                                  message_id=MsgIds.MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST.value,
-                                                  payload=payload)
-
         self.logger.debug("Setting sensor {} to {} C".format(FPTemperaturesNames[str(sensor_index)].name, sensor_value))
 
         # Send message