post-rebase cleanup