No code change, reformat.

And removal of unused imports.