Aravind | removed some code