Started work on cleanups for Python 3