Fixes problems with flake8 due to pep8 update
Make codebase compliant with latest PEP8 release.
Merge branch 'graffic-pep8' into develop
Remove superfluous commented code.
Merge branch 'graffic-pep8' into develop