Remove python2
Solve a few