Clean up rebase note