Flake8. Also remove some out of date XXX.