Cleaned up unused imports

Also added 1 missing import.

If this is unnecessary code churn feel free to reject.