Clean up after rebase