Linting, cleanup, removing unused code