Cleanup for Python 3.x switch
Cleanup for Python 3.x switch