text: Title: Clean up shims for old python version
  Body: For example there is code using [six](https://six.readthedocs.io/) to handle 2/3 differences, but there is code that requires 3.5+ (e.g. type annotations syntax) and docs say 3.6+. As Python2 went EOL earlier this year, it's probably good to clean up the old code and dependencies.