Fix Python 3 imports
Remove our own compat in favor of six