Clean up default.xml