As we have dropped support for python2 some time ago, we should also get rid of the six conditions for py2/py3 support. Change-Id: Ic91f762b684917159df07158f71a6f6e199b5cf6