REBASE cleanup