Remove more python2 code

2 jobs for py2 in 26 seconds (queued for 2 seconds)
latest