Pyflakes cleanup.
Merge pull request #545 from 4teamwork/pg_pyflakes_cleanup

Pyflakes cleanup