try removing some of the changes + remove py2 travis