Cleanup imports and unused variables.

Just some cleanups of unused imports and unused class members. Might be a good idea before a release.