Default.xml: clean-up