[TASK] XML clean up