remove unused imports and whitespace cleanup