remove six as a dependency in favour of modifying the few places where p...

Remove six dependency.