Refactoring; Took out unused imports