change order for imports.
remove uneeded import