remove more refs to python2