remove unused imports, fix whitespace