Removed unused imports (merge conflict)