Remove unused imports (fixing rebase errors).