Remove more comments, pass linting