Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -red3e4d4180a4c0f08af285426c247aadfc685847 -r1a6556b9b25ce9822e4f9a5d1fd51b488e48aa03
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision ed3e4d4180a4c0f08af285426c247aadfc685847)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 1a6556b9b25ce9822e4f9a5d1fd51b488e48aa03)
@@ -41,7 +41,6 @@
 
 static SAMPLE_WATER_STATE_T handleWaterSampleSetupState( void );
 static SAMPLE_WATER_STATE_T handleWaterSampleState( void );
-static SAMPLE_WATER_STATE_T handleWaterSampleResultState( void );
 
 /*********************************************************************//**
  * @brief
@@ -93,10 +92,6 @@
             currentSampleWaterState = handleWaterSampleState();
             break;
 
-        case SAMPLE_WATER_RESULT_STATE:
-            currentSampleWaterState = handleWaterSampleResultState();
-            break;
-
         default:
             // TODO: alarm
             break;
@@ -124,13 +119,7 @@
  *************************************************************************/
 BOOL isSampleWaterPassed( void )
 {
-    BOOL result = FALSE;
-
-    if ( SAMPLE_WATER_RESULT_STATE == currentSampleWaterState )
-    {
-        result = sampleWaterResult;
-    }
-    return result;
+    return sampleWaterResult;
 }
 
 /*********************************************************************//**
@@ -233,8 +222,12 @@
     if ( TRUE == sampleWaterEntered )
     {
         sampleWaterEntered = FALSE;
-        state = SAMPLE_WATER_RESULT_STATE;
         cmdDGSampleWater( SAMPLE_WATER_CMD_END );
+
+        if ( FALSE == sampleWaterResult )
+        {
+            // TODO: Trigger fault
+        }
     }
 
     if ( TRUE == sampleWaterStartRequested )
@@ -252,22 +245,4 @@
     return state;
 }
 
-/*********************************************************************//**
- * @brief
- * The handleWaterSampleResultState function triggers a fault if user
- * provides failed sample water result.
- * @details Inputs: sampleWaterFailed
- * @details Outputs: triggers a fault alarm
- * @return current state
-*************************************************************************/
-static SAMPLE_WATER_STATE_T handleWaterSampleResultState( void )
-{
-    if ( FALSE == sampleWaterResult )
-    {
-        // TODO: Trigger fault
-    }
-
-    return SAMPLE_WATER_RESULT_STATE;
-}
-
 /**@}*/