cleanups, py3 files