Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r18f5ac036baf7dca352e881bdd64d6fd742d8c58 -rd305a91c82fe89a76d9accbb8faa3d81e3106341
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 18f5ac036baf7dca352e881bdd64d6fd742d8c58)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision d305a91c82fe89a76d9accbb8faa3d81e3106341)
@@ -18,7 +18,6 @@
 #include <string.h>             // For memcpy
 
 #include "ConductivitySensors.h"
-#include "ConductivityTeensy.h"
 #include "FpgaDD.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
@@ -81,23 +80,14 @@
 
 static CONDUCTIVITY_SENSOR_CONTROL_T conductivitySensorControl[ NUM_OF_CONDUCTIVITY_SENSORS ];          ///< Conductivity sensor Control for reset, init, read and write operations.
 
-static const TEENSY_SENSOR_INDEX_T teensySensorMapping[NUM_OF_CONDUCTIVITY_SENSORS] = {
-    [D17_COND] = TEENSY_SENSOR_0,
-    [D27_COND] = TEENSY_SENSOR_1,
-    [D43_COND] = TEENSY_SENSOR_2,
-    [D74_COND] = TEENSY_SENSOR_3,
-    [P9_COND]  = TEENSY_SENSOR_4,
-    [P18_COND] = TEENSY_SENSOR_5
-};
-
 // ********** private function prototypes **********
 
 static void checkConductivitySensors( void );
 static CONDUCTIVITY_READ_STATE_T handleConductivitySensorsReadInitiate( CONDUCTIVITY_SENSORS_T sensorID );
 static CONDUCTIVITY_WRITE_STATE_T handleConductivitySensorsWriteComplete( CONDUCTIVITY_SENSORS_T sensorID );
 static CONDUCTIVITY_WRITE_STATE_T handleConductivitySensorsWriteInitiate( CONDUCTIVITY_SENSORS_T sensorID );
 static CONDUCTIVITY_READ_STATE_T handleConductivitySensorsReadComplete( CONDUCTIVITY_SENSORS_T sensorID );
-static TEENSY_SENSOR_INDEX_T getTeensySensorNum( CONDUCTIVITY_SENSORS_T sensorID );
+
 /*********************************************************************//**
  * @brief
  * The initConductivitySensors function initializes the ConductivitySensors unit.
@@ -157,7 +147,7 @@
     //initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_FP_P9_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
     //initFPGAPersistentAlarm( FPGA_PERS_ERROR_P18_COND_SENSOR, ALARM_ID_FP_P18_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
 
-    initCondTeensy();
+
 }
 
 
@@ -1002,16 +992,6 @@
     return state;
 }
 
-static TEENSY_SENSOR_INDEX_T getTeensySensorNum( CONDUCTIVITY_SENSORS_T sensorID )
-{
-    if ( sensorID >= NUM_OF_CONDUCTIVITY_SENSORS )
-    {
-        return MAX_TEENSY_SENSOR; // Invalid sensor ID
-    }
-    return teensySensorMapping[ sensorID ];
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/