Remove unused imports
Fix extractor