Removed the common xml block from all fo the xml templates for a refactor.