* Cleanup six.moves Regenerate files so all imports are present, comment out imports that fail. Remove useless files. * Fix flake8