Cleanup for Python 3.x