Finish refactoring out py3compat and delete the file