Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -r3b97a99ae360edaafcf73614162b267fc36e6a0c -rd9c77cf6cde58aba425b8df3de610eb0c533b70e
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 3b97a99ae360edaafcf73614162b267fc36e6a0c)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision d9c77cf6cde58aba425b8df3de610eb0c533b70e)
@@ -125,14 +125,11 @@
 // ********** private function prototypes **********
 
 static void initCondDMAchannels( void );
-static void initEEPROMdata( void );
-static void initMeasurementSettings( void );
 
 static COND_COMM_STATE_T handleConductivityInit( void );
 static COND_COMM_STATE_T handleConductivityIdle( void );
 static COND_COMM_STATE_T handleConductivityTX( void );
 static COND_COMM_STATE_T handleConductivityRX( void );
-static COND_COMM_STATE_T handleFailedState( void );
 
 static void consumeUnexpectedConductivityData( void );
 static void setupConductivityDMAForWriteCmd( U32 bytes2Transmit );
@@ -181,7 +178,6 @@
 static COND_COMM_STATE_T txSelectSensor( void );
 static COND_COMM_STATE_T rxSelectSensor( void );
 
-static COND_PARSE_STATUS parseMeasurementSettings( const U08 *buffer, U32 len );
 static COND_PARSE_STATUS parseEEPROMdata( const U08 *buffer, U32 len );
 static COND_PARSE_STATUS parseConductivityMeasurements( const U08 *buffer );
 
@@ -334,10 +330,6 @@
              condCommState = handleConductivityRX();
              break;
 
-         case COND_COMM_STATE_FAILED:
-             condCommState = handleFailedState();
-             break;
-
          default:
              SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, ( U32 )condCommState )
              break;
@@ -525,50 +517,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleFailedState function handles failure or errors of the states.
- * @details \b Inputs: currentCmd - Current command being executed.
- * The error occurred during TX  or RX phase of this command.
- * @details \b Outputs: none
- * @return state - Next state.
- *************************************************************************/
-static COND_COMM_STATE_T handleFailedState( void )
-{
-    COND_COMM_STATE_T state = COND_COMM_STATE_FAILED;
-
-    switch ( currentCmd )
-    {
-        case TEENSY_CMD_INIT_SENSOR:
-            break;
-        case TEENSY_CMD_GET_INIT_STATUS:
-            break;
-        case TEENSY_CMD_UPDATE_EEPROM_DATA:
-            break;
-        case TEENSY_CMD_GET_EEPROM_DATA:
-            break;
-        case TEENSY_CMD_UPDATE_MEASUREMENT_SETTINGS:
-            break;
-        case TEENSY_CMD_GET_MEASUREMENT_SETTINGS:
-            break;
-        case TEENSY_CMD_START_MEASUREMENT:
-            break;
-        case TEENSY_CMD_STOP_MEASUREMENT:
-            break;
-        case TEENSY_CMD_GET_ALL_MEASUREMENTS:
-            break;
-        case TEENSY_CMD_GET_SINGLE_MEASUREMENT:
-            break;
-        case TEENSY_CMD_SELECT_SENSOR:
-            break;
-        default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
-            break;
-    }
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
  * The consumeUnexpectedConductivityData function checks to see if a byte is sitting in
  * the SCI received data register and consumes the byte if found.
  * @details \b Inputs: SCI FLR register