Clean up some old pep8/pylint violations

Also, deletes some unused code.

@ormsbee could you take a look and make sure I didn't do anything particularly egregious?