Merge "Remove old pep8 ignores that are no longer necessary"