clean up rebase