Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -129,10 +129,6 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
 
-#ifdef SKIP_SAMPLE_WATER
-    sampleWaterResult = TRUE;
-#endif
-
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
     {
         sampleWaterResult = TRUE;