7/8: Remove xml param
24 files changed