Remove some unwanted duplicate imports
Revert "Unused imports, yep, again"

This reverts commit b02320594424190a673b4c5f273b8256aee71f20.