Cleanup data_specs and drop support for 'old pickled models'