Merge pull request #24258 from vespa-engine/balder/always-use-bitvector-if-it-is-a-good-idea

Balder/always use bitvector if it is a good idea

28 files changed, 8 insertions, 164 deletions

diff --git a/config-model/src/test/derived/advanced/attributes.cfg b/config-model/src/test/derived/advanced/attributes.cfg
index 0b4e28f0cbf..2d7d445bb04 100644
--- a/config-model/src/test/derived/advanced/attributes.cfg
+++ b/config-model/src/test/derived/advanced/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
index e24ed687b93..38bcd36884d 100644
--- a/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/array_of_struct_attribute/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/attributeprefetch/attributes.cfg b/config-model/src/test/derived/attributeprefetch/attributes.cfg
index 3168ec24b98..8099555c692 100644
--- a/config-model/src/test/derived/attributeprefetch/attributes.cfg
+++ b/config-model/src/test/derived/attributeprefetch/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -253,7 +245,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -283,7 +274,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -313,7 +303,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -343,7 +332,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -373,7 +361,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -403,7 +390,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -433,7 +419,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -463,7 +448,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/attributes/attributes.cfg b/config-model/src/test/derived/attributes/attributes.cfg
index 07a3631819d..ad082058a79 100644
--- a/config-model/src/test/derived/attributes/attributes.cfg
+++ b/config-model/src/test/derived/attributes/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -253,7 +245,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -283,7 +274,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -313,7 +303,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -343,7 +332,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -373,7 +361,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -403,7 +390,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector true
 attribute[].fastaccess false
 attribute[].arity 8
@@ -433,7 +419,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess true
 attribute[].arity 8
@@ -463,7 +448,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector true
 attribute[].fastaccess false
 attribute[].arity 8
@@ -493,7 +477,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -523,7 +506,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -553,7 +535,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/complex/attributes.cfg b/config-model/src/test/derived/complex/attributes.cfg
index 0772b797777..2b3ba750504 100644
--- a/config-model/src/test/derived/complex/attributes.cfg
+++ b/config-model/src/test/derived/complex/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -253,7 +245,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/function_arguments/attributes.cfg b/config-model/src/test/derived/function_arguments/attributes.cfg
index 101fe901ce2..7678476aba1 100644
--- a/config-model/src/test/derived/function_arguments/attributes.cfg
+++ b/config-model/src/test/derived/function_arguments/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg b/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg
index 7280596be5b..11e71f610ed 100644
--- a/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg
+++ b/config-model/src/test/derived/function_arguments_with_expressions/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/hnsw_index/attributes.cfg b/config-model/src/test/derived/hnsw_index/attributes.cfg
index 99a0d93fd35..831327f8a0f 100644
--- a/config-model/src/test/derived/hnsw_index/attributes.cfg
+++ b/config-model/src/test/derived/hnsw_index/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
index 70f1f21b465..51de756114b 100644
--- a/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
+++ b/config-model/src/test/derived/imported_fields_inherited_reference/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/imported_position_field/attributes.cfg b/config-model/src/test/derived/imported_position_field/attributes.cfg
index 2d1d1b232b1..2ab30bcef83 100644
--- a/config-model/src/test/derived/imported_position_field/attributes.cfg
+++ b/config-model/src/test/derived/imported_position_field/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/imported_struct_fields/attributes.cfg b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
index 31eb66776d4..36106ca74bf 100644
--- a/config-model/src/test/derived/imported_struct_fields/attributes.cfg
+++ b/config-model/src/test/derived/imported_struct_fields/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/importedfields/attributes.cfg b/config-model/src/test/derived/importedfields/attributes.cfg
index 7f2cb39dc3d..ad511fedeab 100644
--- a/config-model/src/test/derived/importedfields/attributes.cfg
+++ b/config-model/src/test/derived/importedfields/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/inheritance/attributes.cfg b/config-model/src/test/derived/inheritance/attributes.cfg
index 9ab0cb0c67e..6abafd7fb8f 100644
--- a/config-model/src/test/derived/inheritance/attributes.cfg
+++ b/config-model/src/test/derived/inheritance/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/inheritfromparent/attributes.cfg b/config-model/src/test/derived/inheritfromparent/attributes.cfg
index 27a18a58bfd..5138cf8257c 100644
--- a/config-model/src/test/derived/inheritfromparent/attributes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/map_attribute/attributes.cfg b/config-model/src/test/derived/map_attribute/attributes.cfg
index 0cfcc75d3b3..f0171f8c213 100644
--- a/config-model/src/test/derived/map_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_attribute/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
index 7e6f7c282db..91ea48b566e 100644
--- a/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
+++ b/config-model/src/test/derived/map_of_struct_attribute/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/multiplesummaries/attributes.cfg b/config-model/src/test/derived/multiplesummaries/attributes.cfg
index 448c1f4957a..27d2987f0af 100644
--- a/config-model/src/test/derived/multiplesummaries/attributes.cfg
+++ b/config-model/src/test/derived/multiplesummaries/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/music/attributes.cfg b/config-model/src/test/derived/music/attributes.cfg
index 0c37cdb207f..69693b19078 100644
--- a/config-model/src/test/derived/music/attributes.cfg
+++ b/config-model/src/test/derived/music/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -253,7 +245,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -283,7 +274,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -313,7 +303,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/newrank/attributes.cfg b/config-model/src/test/derived/newrank/attributes.cfg
index 60d174d4b12..469c7a2a549 100644
--- a/config-model/src/test/derived/newrank/attributes.cfg
+++ b/config-model/src/test/derived/newrank/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -253,7 +245,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -283,7 +274,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/predicate_attribute/attributes.cfg b/config-model/src/test/derived/predicate_attribute/attributes.cfg
index d5810e78185..4f80da6d374 100644
--- a/config-model/src/test/derived/predicate_attribute/attributes.cfg
+++ b/config-model/src/test/derived/predicate_attribute/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 5
diff --git a/config-model/src/test/derived/prefixexactattribute/attributes.cfg b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
index 65a0df45fd6..86c10cea86a 100644
--- a/config-model/src/test/derived/prefixexactattribute/attributes.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/reference_fields/attributes.cfg b/config-model/src/test/derived/reference_fields/attributes.cfg
index a79bf71f65c..c035f474ba7 100644
--- a/config-model/src/test/derived/reference_fields/attributes.cfg
+++ b/config-model/src/test/derived/reference_fields/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/schemainheritance/attributes.cfg b/config-model/src/test/derived/schemainheritance/attributes.cfg
index a6ee394dcf3..be3aa9517d0 100644
--- a/config-model/src/test/derived/schemainheritance/attributes.cfg
+++ b/config-model/src/test/derived/schemainheritance/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/sorting/attributes.cfg b/config-model/src/test/derived/sorting/attributes.cfg
index f2074be891f..a15fe5297cf 100644
--- a/config-model/src/test/derived/sorting/attributes.cfg
+++ b/config-model/src/test/derived/sorting/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale "en_US"
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending false
 attribute[].sortfunction RAW
 attribute[].sortstrength SECONDARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction LOWERCASE
 attribute[].sortstrength TERTIARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending false
 attribute[].sortfunction UCA
 attribute[].sortstrength QUATERNARY
 attribute[].sortlocale "en_US"
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction RAW
 attribute[].sortstrength IDENTICAL
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale "en_US"
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending false
 attribute[].sortfunction RAW
 attribute[].sortstrength SECONDARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction LOWERCASE
 attribute[].sortstrength TERTIARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -253,7 +245,6 @@ attribute[].sortascending false
 attribute[].sortfunction UCA
 attribute[].sortstrength QUATERNARY
 attribute[].sortlocale "en_US"
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -283,7 +274,6 @@ attribute[].sortascending true
 attribute[].sortfunction RAW
 attribute[].sortstrength IDENTICAL
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -313,7 +303,6 @@ attribute[].sortascending false
 attribute[].sortfunction LOWERCASE
 attribute[].sortstrength SECONDARY
 attribute[].sortlocale "en_US"
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/structandfieldset/attributes.cfg b/config-model/src/test/derived/structandfieldset/attributes.cfg
index 42557c2de3a..d099bfc6cae 100644
--- a/config-model/src/test/derived/structandfieldset/attributes.cfg
+++ b/config-model/src/test/derived/structandfieldset/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector true
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/tensor/attributes.cfg b/config-model/src/test/derived/tensor/attributes.cfg
index 4cfb2eb97df..752e236bb19 100644
--- a/config-model/src/test/derived/tensor/attributes.cfg
+++ b/config-model/src/test/derived/tensor/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/derived/types/attributes.cfg b/config-model/src/test/derived/types/attributes.cfg
index f7cfbc5216c..69b2e5d0e78 100644
--- a/config-model/src/test/derived/types/attributes.cfg
+++ b/config-model/src/test/derived/types/attributes.cfg
@@ -13,7 +13,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -43,7 +42,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -73,7 +71,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -103,7 +100,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -133,7 +129,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -163,7 +158,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -193,7 +187,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -223,7 +216,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -253,7 +245,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -283,7 +274,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -313,7 +303,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors true
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -343,7 +332,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
@@ -373,7 +361,6 @@ attribute[].sortascending true
 attribute[].sortfunction UCA
 attribute[].sortstrength PRIMARY
 attribute[].sortlocale ""
-attribute[].enablebitvectors false
 attribute[].enableonlybitvector false
 attribute[].fastaccess false
 attribute[].arity 8
diff --git a/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java
index eb9daf02aad..64f3bda4ac4 100644
--- a/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java
@@ -244,16 +244,16 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
         assertEquals(13333, cfg.attribute().get(2).maxuncommittedmemory());
     }
 
-    private void verifyEnableBitVectorDefault(Schema schema) {
+    private void verifyEnableOnlyBitVectorDefault(Schema schema) {
         AttributeFields attributes = new AttributeFields(schema);
         AttributesConfig.Builder builder = new AttributesConfig.Builder();
         attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 13333);
         AttributesConfig cfg = builder.build();
         assertEquals("a", cfg.attribute().get(0).name());
-        assertTrue(cfg.attribute().get(0).enablebitvectors());
+        assertFalse(cfg.attribute().get(0).enableonlybitvector());
 
         assertEquals("b", cfg.attribute().get(1).name());
-        assertFalse(cfg.attribute().get(1).enablebitvectors());
+        assertTrue(cfg.attribute().get(1).enableonlybitvector());
     }
 
     @Test
@@ -267,10 +267,14 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
                         "    }\n" +
                         "    field b type int { \n" +
                         "      indexing: attribute \n" +
+                        "      attribute {\n" +
+                        "        fast-search\n" +
+                        "        enable-only-bit-vector\n" +
+                        "      }\n" +
                         "    }\n" +
                         "  }\n" +
                         "}\n");
-        verifyEnableBitVectorDefault(schema);
+        verifyEnableOnlyBitVectorDefault(schema);
     }
 
     @Test
@@ -296,7 +300,6 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
         single.setRemoveIfZero(true);
         single.setCreateIfNonExistent(true);
         single.setPrefetch(Boolean.TRUE);
-        single.setEnableBitVectors(true);
         single.setEnableOnlyBitVector(true);
         single.setFastSearch(true);
         single.setPaged(true);
@@ -318,7 +321,6 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
         assertTrue(array.isRemoveIfZero());
         assertTrue(array.isCreateIfNonExistent());
         assertTrue(array.isPrefetch());
-        assertTrue(array.isEnabledBitVectors());
         assertTrue(array.isEnabledOnlyBitVector());
         assertTrue(array.isFastSearch());
         assertTrue(array.isPaged());