Remove object store - replace with object relationships.