removed old code, comments