Remove unused imports, fix whitespace