vendor: Rebase cleanup