some post rebase cleanup