Remove unused imports and format