clean up after rebase