Removed redundant imports after refactoring