Koustubh-Removing the old code