ECOM-7196 Updating model to only include the non-deprecated fields. This work is a follow on to ECOM-7195 and SHOULD NOT be merged until that PR is merged.
