A smaller version than the original remove ivory-data PR.
Merge pull request #419 from ambiata/topic/undata

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