CMS-4324 Cleanup duplicate xml objects. Removed unused xml objects.