Revert "datamodel update"

This reverts commit c910106a5416b01e7cdbe93dce039d87085bf1cc.