Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -rd25471a9b256c1dce1aec7de73f53c730ff70cd0 -rdd0e9acd5f0fb570403be8908ac45e79840d4b70
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision d25471a9b256c1dce1aec7de73f53c730ff70cd0)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision dd0e9acd5f0fb570403be8908ac45e79840d4b70)
@@ -46,9 +46,9 @@
 static U32 preGenPermeateDefWaterCheckTimer;
 
 // ********** private function prototypes **********
+
 static FP_PRE_GENP_DEF_MODE_STATE_T handlePreGenPDefInletPressureCheckState( void );
 static FP_PRE_GENP_DEF_MODE_STATE_T handlePreGenPDefFlushState( void );
-static FP_PRE_GENP_DEF_MODE_STATE_T handlePreGenPDefInletWaterState( void );
 static FP_PRE_GENP_DEF_MODE_STATE_T handlePreGenPDefPausedState( void );
 static void setModePreGenPDefTransition( FP_PRE_GENP_DEF_MODE_STATE_T state );
 static U32 getPreGenPermeateDefDataPublishInterval( void );
@@ -159,6 +159,7 @@
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_CLOSED );
             break;
+
         case FP_PRE_GENP_DEF_FLUSH:
             setValveState( M4_VALV, VALVE_STATE_OPEN );
             setValveState( M12_VALV, VALVE_STATE_OPEN );
@@ -170,6 +171,7 @@
             setValveState( P39_VALV, VALVE_STATE_CLOSED );
             preGenPermeateDefFlushTimer = getMSTimerCount();
             break;
+
         case FP_PRE_GENP_DEF_PAUSED:
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
             setValveState( M12_VALV, VALVE_STATE_CLOSED );
@@ -210,6 +212,7 @@
         signalStartFilterFlush();
         state = FP_PRE_GENP_DEF_FLUSH;
     }
+
     return state;
 }
 
@@ -233,31 +236,6 @@
 
     if( TRUE == didTimeout( preGenPermeateDefFlushTimer, PRE_GEN_DEF_FLUSH_TIMEOUT_MS ) )
     {
-        state = FP_PRE_GENP_DEF_INLET_WATER_CHECK;
-    }
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
- * The handlePreGenPDefInletWaterState handles the pause state of gen permeate
- * defeatured mode.
- * @details \b Inputs:  preGenPermeateDefWaterCheckTimer
- * @details \b Outputs: none
- * @return the next state of gen water defeatured mode
- *************************************************************************/
-static FP_PRE_GENP_DEF_MODE_STATE_T handlePreGenPDefInletWaterState( void )
-{
-    FP_PRE_GENP_DEF_MODE_STATE_T state = FP_PRE_GENP_DEF_INLET_WATER_CHECK;
-
-//    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
-//    {
-//        state = FP_PRE_GENP_DEF_PAUSED;
-//    }
-
-    if( TRUE == didTimeout( preGenPermeateDefWaterCheckTimer, PRE_GEN_DEF_WATER_CHECK_TIMEOUT_MS ) )
-    {
         transitionToGenPermeateDefeaturedMode();
         requestGenWaterDefStart();
     }