Tidy up after rebase