Clean-up imports and make unused imports a compile error.

Someone really likes their blank doc lines