default.xml: rebase cleanup