cleanup rebase