Unused imports

Forgot to save, rest of the cleanup