remove old/python2 references to types like IntType and the like