cleanup after rebase.