some py3 cleanup