Fixup - removed remaining ModelBuilder entity type checks