Remove unnecessary imports, move some to six
Merge pull request #1854 from Ivoz/compat-cleaning

Remove unnecessary imports, move some to six