rebase cleanup