removed old code and comments