Index: firmware/App/Services/ROInterface.c
===================================================================
diff -u -r88f86f2dc5107670e32f53e04e256ad8249ba55f -rd1527b612b7af4bd3103743b5a61ecad3a133ac0
--- firmware/App/Services/ROInterface.c	(.../ROInterface.c)	(revision 88f86f2dc5107670e32f53e04e256ad8249ba55f)
+++ firmware/App/Services/ROInterface.c	(.../ROInterface.c)	(revision d1527b612b7af4bd3103743b5a61ecad3a133ac0)
@@ -41,7 +41,6 @@
 static RO_OP_MODE_T roCurrentOpMode;                                        ///< Current TD operation mode.
 static U32  roSubMode;                                                      ///< Current state (sub-mode) of current TD operation mode.
 static F32  roFlowRate;                                                     ///< RO flow rate
-static RO_CMD_ID cmdID;                                                     ///< RO mode ( Pregen or Gen Water)
 
 static BOOL roOpModeDataFreshFlag = FALSE;                                  ///< Flag to signal/process fresh RO op mode data
 
@@ -62,7 +61,6 @@
     roCurrentOpMode         = RO_MODE_INIT;
     roSubMode               = 0;
     roFlowRate              = MAX_RO_FLOW_RATE;
-    cmdID                   = RO_PRE_GEN;
 }
 
 /**********************************************************************//**
@@ -120,15 +118,15 @@
  * @param startStop To start/stop the RO delivery.
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL cmdROStartStop( BOOL startStop)
+BOOL cmdROStartStop( BOOL startStop, RO_CMD_ID cmdMode)
 {
     RO_WATER_REQ_PAYLOAD_T roStartRequest;
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
 
     // Populate RO start message
-    roStartRequest.cmdID    = (U32)getROModeCmd();
+    roStartRequest.cmdID    = (U32)cmdMode;
     roStartRequest.start    = startStop;
     roStartRequest.roRate   = getROFlowRate();
 
@@ -172,32 +170,6 @@
 
 /*********************************************************************//**
  * @brief
- * The setROModeCmd function sets RO operation mode to be transitioned when
- * start/stop request sent from DD .
- * @details \b Inputs: none
- * @details \b Outputs: cmdID
- * @param cmdMode RO Operation mode change
- * @return none.
- *************************************************************************/
-void setROModeCmd( RO_CMD_ID cmdMode )
-{
-    cmdID = cmdMode;
-}
-
-/*********************************************************************//**
- * @brief
- * The getROModeCmd function gets the last set RO mode for transition request.
- * @details \b Inputs: RO Operation mode change command
- * @details \b Outputs: none
- * @return latest RO Mode change command.
- *************************************************************************/
-RO_CMD_ID getROModeCmd( void )
-{
-    return cmdID;
-}
-
-/*********************************************************************//**
- * @brief
  * The getROOpMode function gets the current latest reported RO operating mode.
  * @details \b Inputs: roCurrentOpMode
  * @details \b Outputs: none
Index: firmware/App/Services/ROInterface.h
===================================================================
diff -u -r88f86f2dc5107670e32f53e04e256ad8249ba55f -rd1527b612b7af4bd3103743b5a61ecad3a133ac0
--- firmware/App/Services/ROInterface.h	(.../ROInterface.h)	(revision 88f86f2dc5107670e32f53e04e256ad8249ba55f)
+++ firmware/App/Services/ROInterface.h	(.../ROInterface.h)	(revision d1527b612b7af4bd3103743b5a61ecad3a133ac0)
@@ -41,11 +41,9 @@
 void initROInterface( void );
 void execROInterfaceMonitor( void );
 
-BOOL cmdROStartStop( BOOL startStop);
+BOOL cmdROStartStop( BOOL startStop, RO_CMD_ID cmdMode);
 void setROFlowRate( F32 roFlow );
 F32 getROFlowRate( void );
-void setROModeCmd( RO_CMD_ID cmdMode );
-RO_CMD_ID getROModeCmd( void );
 
 void setROOpMode( U32 opMode, U32 subMode );
 RO_OP_MODE_T      getROOpMode( void );