[REM]Removed unused code as per spec changed