Got rid of some cruft using pylint