Cleanup for final Python 2 version.