Removed cruft, flake8 passing