Optimize imports

We have lots of unused imports. This PR cleans them up.