removed old code along with its comments