Removing unused imports
Refactoring