Clean up some old pep8/pylint violations

Also, deletes some unused code.