Remove unused imports.  Typographical clean-up.