[#1709] Akash/Faris : Removed unused code.