Initial attempt to remove 2to3 code