[MERGE] cleaned some imports, removed some code for older python versions.