removing the need for the six module while keeping Py2/3 compatibility

I noticed that there is relatively little use of the six module in the project, and these minor changes remove the need altogether.
I don't think we need to support pre 2.6.