Clean system dependency fixes, older pep8 support