More unused imports

There is a LOT more to come, but this is a good start.

Change-Id: I964f6af686ddc71602ba9ddcf6a1bb84a6d5169e