Removing some unused imports