Remove functions created for pre-six 1.7.0

With the new six version we can remove some
of the utility functions that we created now
that upstream six has equivalent or better
functionality.

Change-Id: I637fcf1475ca1af02608e736ca920c3e116c5529
Merge "Remove functions created for pre-six 1.7.0"