Clean up imports

Remove a bunch of unused imports and grouped/ordered the existing
ones better.

Fixes OS-226

Change-Id: I2f9f14ef70a03f9d48ab371be1f81dbe53b7e38f