More python-r1 reqs, cleanups