Python 2/3 compat fixes
Deleting unneeded old imports