Linting + remove dead code