Remove unused imports and fix white-space lint issues.