DAM-281: Cleanup xml output