Remove GtEntityType in favor of FieldType