[Sandeep/Prasath] Removed unused code.