trivial cleanup of imports
Just to make sure I am cleanly setup in git.