Removing some of the unused imports