Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rf7c714a1a09b10d85a8b013712532d37b4d7b97a -ra14bc308c72272ce0275d263cf010c90d8a37355
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f7c714a1a09b10d85a8b013712532d37b4d7b97a)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a14bc308c72272ce0275d263cf010c90d8a37355)
@@ -394,67 +394,6 @@
 
 /*********************************************************************//**
  * @brief
- * The requestWaterSample function handles an TD request to sample water.
- * @details \b Inputs: standbyState
- * @details \b Outputs: pendingSampleWaterRequest
- * @return TRUE if request accepted, FALSE if not.
- *************************************************************************/
-void waterSampleCommandHandler( SAMPLE_WATER_CMD_T sampleWaterCmd )
-{
-//    DD_CMD_RESPONSE_T cmdResponse;
-//
-//    cmdResponse.commandID  = DD_CMD_SAMPLE_WATER;
-//    cmdResponse.rejected   = TRUE;
-//    cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_INVALID_MODE;
-//
-//    switch ( sampleWaterCmd )
-//    {
-//        case SAMPLE_WATER_CMD_STOP:
-//            if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_SAMPLE_WATER == standbyState ) )
-//            {
-//                stopSampleWaterRequest = TRUE;
-//                cmdResponse.rejected   = FALSE;
-//                cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
-//            }
-//            break;
-//
-//        case SAMPLE_WATER_CMD_START:
-//            if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE == standbyState ) )
-//            {
-//                startSampleWaterRequest = TRUE;
-//                cmdResponse.rejected    = FALSE;
-//                cmdResponse.rejectCode  = DD_CMD_REQUEST_REJECT_REASON_NONE;
-//            }
-//            break;
-//
-//        case SAMPLE_WATER_CMD_FLUSH:
-//            if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) )
-//            {
-//                flushFilterRequest     = TRUE;
-//                cmdResponse.rejected   = FALSE;
-//                cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
-//            }
-//            break;
-//
-//        case SAMPLE_WATER_CMD_END:
-//            if ( DD_MODE_STAN == getCurrentOperationMode() )
-//            {
-//                endSampleWaterRequest  = TRUE;
-//                cmdResponse.rejected   = FALSE;
-//                cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE;
-//            }
-//            break;
-//
-//        default:
-//            cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER;
-//            break;
-//    }
-//
-//    sendCommandResponseMsg( &cmdResponse );
-}
-
-/*********************************************************************//**
- * @brief
  * The requestDDStart function handles an TD request to start (go to generation idle mode).
  * @details \b Inputs: standbyState
  * @details \b Outputs: pendingSampleWaterRequest