removed old code, linting