Rebase cleanup