Index: firmware/App/Drivers/TemperatureSensors.c
===================================================================
diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df
--- firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
+++ firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 72ae21d8343d3a2b07a47452ff48549e25f876df)
@@ -19,7 +19,6 @@
 #include <string.h> // For memset()
 
 #include "Conductivity.h"
-#include "Flow.h"
 #include "FpgaRO.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
@@ -329,14 +328,6 @@
             temperature = getConductivityTemperatureValue( P18_COND );
             break;
 
-        case P7_TEMP:
-            temperature = getFilteredFlowSensorTemperature( P7_FLOW );
-            break;
-
-        case P16_TEMP:
-            temperature = getFilteredFlowSensorTemperature( P16_FLOW );
-            break;
-
 //        case TEMPSENSORS_BOARD_TEMPERATURE:
 //            //TODO : Need details on calculations.
 //            break;
@@ -412,12 +403,12 @@
 //
 //    switch( sesnorIndex )
 //    {
-//        case TEMP_SENSOR_TRO1:
-//            //calId = CAL_DATA_TRO1_TEMP;
+//        case P23_TEMP:
+//            //calId = CAL_DATA_P23_TEMP;
 //            break;
 //
-//        case TEMP_SENSOR_TRO2:
-//            //calId = CAL_DATA_TRO2_TEMP;
+//        case P22_TEMP:
+//            //calId = CAL_DATA_P22_TEMP;
 //            break;
 //
 //        default: