Clean data files

Unused data removed, other data modified appropriately.