Updated data_names and data_values

The removals were duplicates and a few conflicts. Fortunately the conflicts had obvious resolutions.