Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -re6dc73b45ec3d0df4c9a03673625862b71acd608 -r6085153faf2a176c51a34653bdd3a36a4699e528
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e6dc73b45ec3d0df4c9a03673625862b71acd608)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6085153faf2a176c51a34653bdd3a36a4699e528)
@@ -192,11 +192,11 @@
  *************************************************************************/
 void checkInletWaterConductivity( void )
 {
+#ifndef DISABLE_WATER_QUALITY_CHECK
     F32 const conductivity = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
     BOOL const isCondTooHigh = ( conductivity > COND_SENSOR_CPI_MAX_VALUE );
     BOOL const isCondTooLow = ( conductivity < COND_SENSOR_CPI_MIN_VALUE );
 
-#ifndef DISABLE_WATER_QUALITY_CHECK
     checkPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, isCondTooHigh, conductivity, COND_SENSOR_CPI_MAX_VALUE );
     checkPersistentAlarm( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, isCondTooLow, conductivity, COND_SENSOR_CPI_MIN_VALUE );
 #endif
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -rb739ca257159d144f746e0cb460b33879bcd8596 -r6085153faf2a176c51a34653bdd3a36a4699e528
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision b739ca257159d144f746e0cb460b33879bcd8596)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 6085153faf2a176c51a34653bdd3a36a4699e528)
@@ -126,7 +126,6 @@
 void execLoadCell( void )
 {
     U32 ii;
-    F32 A1,B1,prevA1,prevB1;
 
     // update sums for load cell average calculations
     loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].measuredReadingSum += getFPGALoadCellA1();