XML cleanup - no code changes