A smaller version than the original remove ivory-data PR.

I'm all for create sub-arbitrary files where we can ala Eric's PR.