Simple cleanup of generated xml