remove unused imports and clean