fix some unnecessary Py2-isms in the code base
fix some unnecessary Py1.x-isms in the code base