default.xml: clean-up