Get rid of CMG-specific data formats (part 3)