Clean up some old pep8/pylint violations

Also, deletes some unused code.
Merge pull request #1115 from edx/diana/verify-pep8-pylint

Clean up some old pep8/pylint violations