Removed dead code, fixed linting