Remove unused imports
Major refactoring