linting, cleanup, removing unused code