CDE REST Services refactoring to remove duplicates in XML, fix CSV file
generation