Unused imports cleanup.

Feel free to reject this if you guys don't feel passionately about unused imports.