Removed unused imports in core