Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f -ra85a030e1a424b6546c57e5e80f21500103e13ea
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision a85a030e1a424b6546c57e5e80f21500103e13ea)
@@ -41,6 +41,7 @@
 static SELF_TEST_STATUS_T faultPOSTSelfTestResult;                  ///< Fault POST self test result.
 
 // ********** private function prototypes **********
+
 static DD_FAULT_STATE_T handleFaultStartState( void );
 static DD_FAULT_STATE_T handleFaultDeenergizedState( void );
 static DD_FAULT_STATE_T handleFaultEnergizedState( void );
@@ -107,18 +108,8 @@
             faultState = handleFaultEnergizedState();
             break;
 
-        case DD_FAULT_STATE_COMPLETE:
-            // Do nothing unless the test configuration to recover treatment is enabled
-            if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) ) && ( TRUE == hasRecoverFromFaultModeBeenSet() ) )
-            {
-                DD_OP_MODE_T prevMode = getPreviousOperationMode();
-
-                requestNewOperationMode( prevMode );
-            }
-            break;
-
         default:
-            faultState = DD_FAULT_STATE_COMPLETE;
+            faultState = DD_FAULT_STATE_START;
             break;
     }
 
@@ -359,6 +350,7 @@
  *************************************************************************/
 static DD_FAULT_NVDATA_STATE_T handleFaultNVDataMgmtStartState( void )
 {
+    //TODO : Revisit once NV data management been implemented
     DD_FAULT_NVDATA_STATE_T state             = DD_FAULT_NVDATA_STATE_START;
     //NVDATAMGMT_RECORDS_READ_STATUS_T status = getNVRecordsReadStatus();
 
@@ -389,6 +381,7 @@
  *************************************************************************/
 static DD_FAULT_NVDATA_STATE_T handleFaultRunNVPOSTsState( void )
 {
+    //TODO : Revisit once NV data management been implemented
     DD_FAULT_NVDATA_STATE_T state = DD_FAULT_NVDATA_STATE_RUN_NV_POSTS;
 
 //    faultPOSTSelfTestResult = execNVDataMgmtSelfTest();
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f -ra85a030e1a424b6546c57e5e80f21500103e13ea
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision a85a030e1a424b6546c57e5e80f21500103e13ea)
@@ -246,7 +246,7 @@
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
 
-            //close the DD - water inlet and drain valves?
+            //TODO : close the DD - water inlet and drain valves?
             break;
 
         case DD_GEND_ISOLATED_UF_STATE: