More rebase cleanup