removed datamodel constructs that are not used