text: Title: Remove all python 2 compatibility code
  Body: This should be done after #1082.
  
  For example, remove all imports of six, or any other edge cases where python 2 is handled differently from python 3.