Merge "Remove unused pep8 scanner"