fix imports so they work on Python 2 & 3
fix imports so they work on Python 2 & 3, remove imports not used