Get rid of Python 2.x cruft