Change to remove unused xmlquotas and to not omit xml declaration by default