diff --git a/definitions/bufr/section.3.def b/definitions/bufr/section.3.def
index 7bbe1c486..c8e0d70a7 100644
--- a/definitions/bufr/section.3.def
+++ b/definitions/bufr/section.3.def
@@ -26,10 +26,10 @@ if (masterTablesVersionNumber == 19) {
 }
 constant rootTablesDir="bufr/tables" : hidden;
 
-meta clearTables bufr_clear_tables() = 0 : hidden,no_copy;
+#meta clearTables bufr_clear_tables() = 0 : hidden,no_copy;
 
-when (changed(tablesMasterDir)) { set clearTables=1;}
-when (changed(tablesLocalDir)) { set clearTables=1;}
+#when (changed(tablesMasterDir)) { set clearTables=1;}
+#when (changed(tablesLocalDir)) { set clearTables=1;}
 
 # we should implement some table version dependency
 #constant templatesMasterDir="bufr/templates/[masterTableNumber]/[masterTablesVersionNumber]";
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 676964ff4..a56277b6f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -64,7 +64,6 @@ list( APPEND grib_api_srcs
     grib_accessor_class_bitmap.c
     grib_accessor_class_bits.c
     grib_accessor_class_bits_per_value.c
-    grib_accessor_class_bufr_clear_tables.c
     grib_accessor_class_bufr_elements_table.c
     grib_accessor_class_bufr_data_array.c
     grib_accessor_class_bufr_data_element.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f95b6c6e9..bddbd606a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,6 @@ libeccodes_la_prototypes= \
 	grib_accessor_class_bitmap.c \
 	grib_accessor_class_bits.c  \
 	grib_accessor_class_bits_per_value.c \
-	grib_accessor_class_bufr_clear_tables.c \
 	grib_accessor_class_bufr_data_array.c \
 	grib_accessor_class_bufr_data_element.c \
 	grib_accessor_class_bufr_elements_table.c \
diff --git a/src/accessor_class_hierarchy.txt b/src/accessor_class_hierarchy.txt
index 291861bc7..aabf82057 100644
--- a/src/accessor_class_hierarchy.txt
+++ b/src/accessor_class_hierarchy.txt
@@ -21,7 +21,6 @@ Generated by src/make_accessor_class_hierarchy_dirs.sh
    |---grib_accessor_class_bits
    |---grib_accessor_class_blob
    |---grib_accessor_class_box
-   |---grib_accessor_class_bufr_clear_tables
    |---grib_accessor_class_bufr_data
    |---grib_accessor_class_bufr_data_array
    |---grib_accessor_class_bufr_data_element
diff --git a/src/grib_accessor_class_bufr_clear_tables.c b/src/deprecated/grib_accessor_class_bufr_clear_tables.c
similarity index 98%
rename from src/grib_accessor_class_bufr_clear_tables.c
rename to src/deprecated/grib_accessor_class_bufr_clear_tables.c
index aa5f5602e..7a80fdee5 100644
--- a/src/grib_accessor_class_bufr_clear_tables.c
+++ b/src/deprecated/grib_accessor_class_bufr_clear_tables.c
@@ -133,8 +133,8 @@ static void init_class(grib_accessor_class* c)
 
 static int pack_long(grib_accessor* a, const long* val, size_t* len)
 {
-    grib_handle* h         = grib_handle_of_accessor(a);
-    h->bufr_elements_table = NULL;
+    //grib_handle* h         = grib_handle_of_accessor(a);
+    //h->bufr_elements_table = NULL;
     return GRIB_SUCCESS;
 }
 
diff --git a/src/grib_accessor_class.h b/src/grib_accessor_class.h
index dcb1b55b2..228372455 100644
--- a/src/grib_accessor_class.h
+++ b/src/grib_accessor_class.h
@@ -12,7 +12,6 @@ extern grib_accessor_class* grib_accessor_class_bits_per_value;
 extern grib_accessor_class* grib_accessor_class_blob;
 extern grib_accessor_class* grib_accessor_class_box;
 extern grib_accessor_class* grib_accessor_class_budgdate;
-extern grib_accessor_class* grib_accessor_class_bufr_clear_tables;
 extern grib_accessor_class* grib_accessor_class_bufr_data_array;
 extern grib_accessor_class* grib_accessor_class_bufr_data_element;
 extern grib_accessor_class* grib_accessor_class_bufr_elements_table;
diff --git a/src/grib_accessor_classes_hash.c b/src/grib_accessor_classes_hash.c
index bf1c8f66f..bdc5efc1d 100644
--- a/src/grib_accessor_classes_hash.c
+++ b/src/grib_accessor_classes_hash.c
@@ -37,12 +37,12 @@ error "gperf generated tables don't work with this execution character set. Plea
 #line 6 "accessor_class_list.gperf"
 struct accessor_class_hash { char *name; grib_accessor_class **cclass;};
 
-#define TOTAL_KEYWORDS 219
+#define TOTAL_KEYWORDS 218
 #define MIN_WORD_LENGTH 1
 #define MAX_WORD_LENGTH 44
 #define MIN_HASH_VALUE 1
-#define MAX_HASH_VALUE 746
-/* maximum key range = 746, duplicates = 0 */
+#define MAX_HASH_VALUE 726
+/* maximum key range = 726, duplicates = 0 */
 
 #ifdef __GNUC__
 
@@ -56,32 +56,32 @@ grib_accessor_classes_get_id (const char *str, unsigned int len)
 {
   static const unsigned short asso_values[] =
     {
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747,   0, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747,   0, 166,
-       32,   3,   2, 747,   5, 747,  11, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747,   0, 747,   0,  98,  78,
-        0,   3, 190,  36, 130,   1,   5,   0,  69, 316,
-       14,  71,  14, 747, 131,   3,   2,  45, 222,   1,
-        0,  39, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747, 747, 747, 747, 747,
-      747, 747, 747, 747, 747, 747
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727,   0, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727,   0, 166,
+       32,   3,   2, 727,   5, 727,  11, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727,   0, 727,   0,  98,  78,
+        0,   3, 144,  36, 165,   1,   5,   5,  69, 300,
+       14,  71,  14, 727, 131,   3,   2,  45, 220,   6,
+        0, 108, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727, 727, 727, 727, 727,
+      727, 727, 727, 727, 727, 727
     };
   register int hval = len;
 
@@ -118,168 +118,167 @@ static const struct accessor_class_hash classes[] =
 #line 9 "accessor_class_list.gperf"
     {" "},
     {""}, {""}, {""}, {""}, {""},
-#line 203 "accessor_class_list.gperf"
+#line 202 "accessor_class_list.gperf"
     {"time", &grib_accessor_class_time},
-#line 191 "accessor_class_list.gperf"
+#line 190 "accessor_class_list.gperf"
     {"size", &grib_accessor_class_size},
 #line 14 "accessor_class_list.gperf"
     {"ascii", &grib_accessor_class_ascii},
     {""},
-#line 204 "accessor_class_list.gperf"
+#line 203 "accessor_class_list.gperf"
     {"times", &grib_accessor_class_times},
     {""},
-#line 188 "accessor_class_list.gperf"
+#line 187 "accessor_class_list.gperf"
     {"signed", &grib_accessor_class_signed},
     {""}, {""},
-#line 71 "accessor_class_list.gperf"
-    {"data_raw_packing", &grib_accessor_class_data_raw_packing},
-#line 168 "accessor_class_list.gperf"
-    {"pad", &grib_accessor_class_pad},
-#line 197 "accessor_class_list.gperf"
-    {"statistics", &grib_accessor_class_statistics},
-#line 134 "accessor_class_list.gperf"
-    {"int8", &grib_accessor_class_int8},
-#line 194 "accessor_class_list.gperf"
-    {"spd", &grib_accessor_class_spd},
-#line 189 "accessor_class_list.gperf"
-    {"signed_bits", &grib_accessor_class_signed_bits},
-#line 132 "accessor_class_list.gperf"
-    {"int64", &grib_accessor_class_int64},
-#line 76 "accessor_class_list.gperf"
-    {"data_simple_packing", &grib_accessor_class_data_simple_packing},
-#line 72 "accessor_class_list.gperf"
-    {"data_secondary_bitmap", &grib_accessor_class_data_secondary_bitmap},
-#line 128 "accessor_class_list.gperf"
-    {"int16", &grib_accessor_class_int16},
-#line 78 "accessor_class_list.gperf"
-    {"dictionary", &grib_accessor_class_dictionary},
-#line 198 "accessor_class_list.gperf"
-    {"statistics_spectral", &grib_accessor_class_statistics_spectral},
-#line 182 "accessor_class_list.gperf"
-    {"section", &grib_accessor_class_section},
-#line 156 "accessor_class_list.gperf"
-    {"nearest", &grib_accessor_class_nearest},
 #line 70 "accessor_class_list.gperf"
+    {"data_raw_packing", &grib_accessor_class_data_raw_packing},
+#line 167 "accessor_class_list.gperf"
+    {"pad", &grib_accessor_class_pad},
+#line 196 "accessor_class_list.gperf"
+    {"statistics", &grib_accessor_class_statistics},
+#line 133 "accessor_class_list.gperf"
+    {"int8", &grib_accessor_class_int8},
+#line 193 "accessor_class_list.gperf"
+    {"spd", &grib_accessor_class_spd},
+#line 188 "accessor_class_list.gperf"
+    {"signed_bits", &grib_accessor_class_signed_bits},
+#line 131 "accessor_class_list.gperf"
+    {"int64", &grib_accessor_class_int64},
+#line 75 "accessor_class_list.gperf"
+    {"data_simple_packing", &grib_accessor_class_data_simple_packing},
+#line 71 "accessor_class_list.gperf"
+    {"data_secondary_bitmap", &grib_accessor_class_data_secondary_bitmap},
+#line 127 "accessor_class_list.gperf"
+    {"int16", &grib_accessor_class_int16},
+#line 77 "accessor_class_list.gperf"
+    {"dictionary", &grib_accessor_class_dictionary},
+#line 197 "accessor_class_list.gperf"
+    {"statistics_spectral", &grib_accessor_class_statistics_spectral},
+#line 181 "accessor_class_list.gperf"
+    {"section", &grib_accessor_class_section},
+#line 155 "accessor_class_list.gperf"
+    {"nearest", &grib_accessor_class_nearest},
+#line 69 "accessor_class_list.gperf"
     {"data_png_packing", &grib_accessor_class_data_png_packing},
-#line 47 "accessor_class_list.gperf"
+#line 46 "accessor_class_list.gperf"
     {"data_apply_bitmap", &grib_accessor_class_data_apply_bitmap},
     {""},
-#line 200 "accessor_class_list.gperf"
+#line 199 "accessor_class_list.gperf"
     {"step_in_units", &grib_accessor_class_step_in_units},
     {""},
-#line 69 "accessor_class_list.gperf"
+#line 68 "accessor_class_list.gperf"
     {"data_jpeg2000_packing", &grib_accessor_class_data_jpeg2000_packing},
-#line 184 "accessor_class_list.gperf"
+#line 183 "accessor_class_list.gperf"
     {"section_padding", &grib_accessor_class_section_padding},
-#line 185 "accessor_class_list.gperf"
+#line 184 "accessor_class_list.gperf"
     {"section_pointer", &grib_accessor_class_section_pointer},
-#line 50 "accessor_class_list.gperf"
+#line 49 "accessor_class_list.gperf"
     {"data_apply_gdsnotpresent", &grib_accessor_class_data_apply_gdsnotpresent},
     {""},
-#line 48 "accessor_class_list.gperf"
+#line 47 "accessor_class_list.gperf"
     {"data_apply_boustrophedonic", &grib_accessor_class_data_apply_boustrophedonic},
     {""},
-#line 118 "accessor_class_list.gperf"
+#line 117 "accessor_class_list.gperf"
     {"gen", &grib_accessor_class_gen},
-#line 84 "accessor_class_list.gperf"
+#line 83 "accessor_class_list.gperf"
     {"expanded_descriptors", &grib_accessor_class_expanded_descriptors},
-    {""},
-#line 79 "accessor_class_list.gperf"
-    {"dirty", &grib_accessor_class_dirty},
-    {""},
-#line 49 "accessor_class_list.gperf"
+    {""}, {""}, {""},
+#line 48 "accessor_class_list.gperf"
     {"data_apply_boustrophedonic_bitmap", &grib_accessor_class_data_apply_boustrophedonic_bitmap},
     {""},
-#line 183 "accessor_class_list.gperf"
+#line 182 "accessor_class_list.gperf"
     {"section_length", &grib_accessor_class_section_length},
-#line 181 "accessor_class_list.gperf"
+#line 180 "accessor_class_list.gperf"
     {"second_order_bits_per_value", &grib_accessor_class_second_order_bits_per_value},
-#line 201 "accessor_class_list.gperf"
+#line 200 "accessor_class_list.gperf"
     {"sum", &grib_accessor_class_sum},
-#line 130 "accessor_class_list.gperf"
+#line 129 "accessor_class_list.gperf"
     {"int32", &grib_accessor_class_int32},
-#line 62 "accessor_class_list.gperf"
+#line 61 "accessor_class_list.gperf"
     {"data_g22order_packing", &grib_accessor_class_data_g22order_packing},
-#line 116 "accessor_class_list.gperf"
+#line 115 "accessor_class_list.gperf"
     {"gds_is_present", &grib_accessor_class_gds_is_present},
-#line 213 "accessor_class_list.gperf"
+#line 212 "accessor_class_list.gperf"
     {"uint32", &grib_accessor_class_uint32},
-#line 66 "accessor_class_list.gperf"
+#line 65 "accessor_class_list.gperf"
     {"data_g2shsimple_packing", &grib_accessor_class_data_g2shsimple_packing},
-#line 215 "accessor_class_list.gperf"
+#line 214 "accessor_class_list.gperf"
     {"uint64", &grib_accessor_class_uint64},
-#line 169 "accessor_class_list.gperf"
+#line 168 "accessor_class_list.gperf"
     {"padding", &grib_accessor_class_padding},
-#line 119 "accessor_class_list.gperf"
+#line 118 "accessor_class_list.gperf"
     {"getenv", &grib_accessor_class_getenv},
-#line 137 "accessor_class_list.gperf"
+#line 136 "accessor_class_list.gperf"
     {"julian_day", &grib_accessor_class_julian_day},
-#line 53 "accessor_class_list.gperf"
+#line 52 "accessor_class_list.gperf"
     {"data_dummy_field", &grib_accessor_class_data_dummy_field},
-#line 217 "accessor_class_list.gperf"
+#line 216 "accessor_class_list.gperf"
     {"uint8", &grib_accessor_class_uint8},
     {""},
-#line 136 "accessor_class_list.gperf"
+#line 135 "accessor_class_list.gperf"
     {"julian_date", &grib_accessor_class_julian_date},
     {""}, {""},
-#line 67 "accessor_class_list.gperf"
+#line 66 "accessor_class_list.gperf"
     {"data_g2simple_packing", &grib_accessor_class_data_g2simple_packing},
-#line 64 "accessor_class_list.gperf"
+#line 63 "accessor_class_list.gperf"
     {"data_g2complex_packing", &grib_accessor_class_data_g2complex_packing},
-#line 199 "accessor_class_list.gperf"
+#line 198 "accessor_class_list.gperf"
     {"step_human_readable", &grib_accessor_class_step_human_readable},
     {""},
-#line 214 "accessor_class_list.gperf"
+#line 213 "accessor_class_list.gperf"
     {"uint32_little_endian", &grib_accessor_class_uint32_little_endian},
     {""},
-#line 216 "accessor_class_list.gperf"
+#line 215 "accessor_class_list.gperf"
     {"uint64_little_endian", &grib_accessor_class_uint64_little_endian},
     {""},
-#line 110 "accessor_class_list.gperf"
-    {"g2grid", &grib_accessor_class_g2grid},
-#line 108 "accessor_class_list.gperf"
-    {"g2date", &grib_accessor_class_g2date},
-#line 117 "accessor_class_list.gperf"
-    {"gds_not_present_bitmap", &grib_accessor_class_gds_not_present_bitmap},
-#line 106 "accessor_class_list.gperf"
-    {"g2bitmap", &grib_accessor_class_g2bitmap},
-#line 140 "accessor_class_list.gperf"
-    {"laplacian", &grib_accessor_class_laplacian},
-#line 141 "accessor_class_list.gperf"
-    {"latitudes", &grib_accessor_class_latitudes},
 #line 109 "accessor_class_list.gperf"
+    {"g2grid", &grib_accessor_class_g2grid},
+#line 107 "accessor_class_list.gperf"
+    {"g2date", &grib_accessor_class_g2date},
+#line 116 "accessor_class_list.gperf"
+    {"gds_not_present_bitmap", &grib_accessor_class_gds_not_present_bitmap},
+#line 105 "accessor_class_list.gperf"
+    {"g2bitmap", &grib_accessor_class_g2bitmap},
+#line 139 "accessor_class_list.gperf"
+    {"laplacian", &grib_accessor_class_laplacian},
+#line 140 "accessor_class_list.gperf"
+    {"latitudes", &grib_accessor_class_latitudes},
+#line 108 "accessor_class_list.gperf"
     {"g2end_step", &grib_accessor_class_g2end_step},
-#line 135 "accessor_class_list.gperf"
+#line 134 "accessor_class_list.gperf"
     {"iterator", &grib_accessor_class_iterator},
     {""},
-#line 82 "accessor_class_list.gperf"
+#line 81 "accessor_class_list.gperf"
     {"element", &grib_accessor_class_element},
-#line 207 "accessor_class_list.gperf"
+#line 206 "accessor_class_list.gperf"
     {"to_string", &grib_accessor_class_to_string},
-#line 68 "accessor_class_list.gperf"
+#line 67 "accessor_class_list.gperf"
     {"data_g2simple_packing_with_preprocessing", &grib_accessor_class_data_g2simple_packing_with_preprocessing},
-#line 113 "accessor_class_list.gperf"
+#line 112 "accessor_class_list.gperf"
     {"g2lon", &grib_accessor_class_g2lon},
-#line 104 "accessor_class_list.gperf"
+#line 103 "accessor_class_list.gperf"
     {"g2_eps", &grib_accessor_class_g2_eps},
-#line 179 "accessor_class_list.gperf"
+#line 178 "accessor_class_list.gperf"
     {"scale", &grib_accessor_class_scale},
-#line 170 "accessor_class_list.gperf"
+#line 169 "accessor_class_list.gperf"
     {"padto", &grib_accessor_class_padto},
     {""},
-#line 159 "accessor_class_list.gperf"
+#line 158 "accessor_class_list.gperf"
     {"number_of_points", &grib_accessor_class_number_of_points},
-#line 190 "accessor_class_list.gperf"
-    {"simple_packing_error", &grib_accessor_class_simple_packing_error},
-#line 52 "accessor_class_list.gperf"
-    {"data_complex_packing", &grib_accessor_class_data_complex_packing},
     {""},
 #line 51 "accessor_class_list.gperf"
+    {"data_complex_packing", &grib_accessor_class_data_complex_packing},
+    {""},
+#line 50 "accessor_class_list.gperf"
     {"data_ccsds_packing", &grib_accessor_class_data_ccsds_packing},
-    {""}, {""}, {""},
-#line 206 "accessor_class_list.gperf"
+    {""},
+#line 189 "accessor_class_list.gperf"
+    {"simple_packing_error", &grib_accessor_class_simple_packing_error},
+    {""},
+#line 205 "accessor_class_list.gperf"
     {"to_integer", &grib_accessor_class_to_integer},
-#line 160 "accessor_class_list.gperf"
+#line 159 "accessor_class_list.gperf"
     {"number_of_points_gaussian", &grib_accessor_class_number_of_points_gaussian},
 #line 16 "accessor_class_list.gperf"
     {"bit", &grib_accessor_class_bit},
@@ -288,377 +287,379 @@ static const struct accessor_class_hash classes[] =
     {""},
 #line 17 "accessor_class_list.gperf"
     {"bitmap", &grib_accessor_class_bitmap},
-#line 220 "accessor_class_list.gperf"
+#line 219 "accessor_class_list.gperf"
     {"unsigned", &grib_accessor_class_unsigned},
     {""},
-#line 157 "accessor_class_list.gperf"
+#line 156 "accessor_class_list.gperf"
     {"non_alpha", &grib_accessor_class_non_alpha},
-#line 218 "accessor_class_list.gperf"
+#line 217 "accessor_class_list.gperf"
     {"unexpanded_descriptors", &grib_accessor_class_unexpanded_descriptors},
     {""}, {""},
-#line 221 "accessor_class_list.gperf"
+#line 220 "accessor_class_list.gperf"
     {"unsigned_bits", &grib_accessor_class_unsigned_bits},
-    {""}, {""}, {""},
+    {""},
+#line 78 "accessor_class_list.gperf"
+    {"dirty", &grib_accessor_class_dirty},
+    {""},
 #line 19 "accessor_class_list.gperf"
     {"bits_per_value", &grib_accessor_class_bits_per_value},
     {""},
-#line 186 "accessor_class_list.gperf"
+#line 185 "accessor_class_list.gperf"
     {"select_step_template", &grib_accessor_class_select_step_template},
-#line 114 "accessor_class_list.gperf"
+#line 113 "accessor_class_list.gperf"
     {"g2step_range", &grib_accessor_class_g2step_range},
     {""}, {""}, {""},
-#line 120 "accessor_class_list.gperf"
+#line 119 "accessor_class_list.gperf"
     {"global_gaussian", &grib_accessor_class_global_gaussian},
     {""}, {""},
-#line 65 "accessor_class_list.gperf"
+#line 64 "accessor_class_list.gperf"
     {"data_g2secondary_bitmap", &grib_accessor_class_data_g2secondary_bitmap},
-#line 63 "accessor_class_list.gperf"
+#line 62 "accessor_class_list.gperf"
     {"data_g2bifourier_packing", &grib_accessor_class_data_g2bifourier_packing},
     {""}, {""}, {""}, {""}, {""},
-#line 187 "accessor_class_list.gperf"
+#line 186 "accessor_class_list.gperf"
     {"sexagesimal2decimal", &grib_accessor_class_sexagesimal2decimal},
-#line 175 "accessor_class_list.gperf"
+#line 174 "accessor_class_list.gperf"
     {"raw", &grib_accessor_class_raw},
-#line 227 "accessor_class_list.gperf"
-    {"when", &grib_accessor_class_when},
-    {""},
-#line 210 "accessor_class_list.gperf"
+    {""}, {""},
+#line 209 "accessor_class_list.gperf"
     {"trim", &grib_accessor_class_trim},
-    {""},
-#line 12 "accessor_class_list.gperf"
-    {"apply_operators", &grib_accessor_class_apply_operators},
+    {""}, {""},
 #line 15 "accessor_class_list.gperf"
     {"assert", &grib_accessor_class_assert},
     {""}, {""},
-#line 139 "accessor_class_list.gperf"
+#line 138 "accessor_class_list.gperf"
     {"label", &grib_accessor_class_label},
-#line 146 "accessor_class_list.gperf"
+#line 145 "accessor_class_list.gperf"
     {"long", &grib_accessor_class_long},
-#line 34 "accessor_class_list.gperf"
-    {"bytes", &grib_accessor_class_bytes},
-#line 81 "accessor_class_list.gperf"
+    {""},
+#line 80 "accessor_class_list.gperf"
     {"double", &grib_accessor_class_double},
     {""},
-#line 208 "accessor_class_list.gperf"
+#line 207 "accessor_class_list.gperf"
     {"transient", &grib_accessor_class_transient},
-#line 111 "accessor_class_list.gperf"
+#line 110 "accessor_class_list.gperf"
     {"g2latlon", &grib_accessor_class_g2latlon},
     {""}, {""},
-#line 102 "accessor_class_list.gperf"
+#line 101 "accessor_class_list.gperf"
     {"g2_aerosol", &grib_accessor_class_g2_aerosol},
 #line 22 "accessor_class_list.gperf"
     {"budgdate", &grib_accessor_class_budgdate},
     {""},
-#line 209 "accessor_class_list.gperf"
+#line 208 "accessor_class_list.gperf"
     {"transient_darray", &grib_accessor_class_transient_darray},
-#line 176 "accessor_class_list.gperf"
+#line 175 "accessor_class_list.gperf"
     {"rdbtime_guess_date", &grib_accessor_class_rdbtime_guess_date},
-#line 172 "accessor_class_list.gperf"
+#line 171 "accessor_class_list.gperf"
     {"padtomultiple", &grib_accessor_class_padtomultiple},
-#line 24 "accessor_class_list.gperf"
+#line 23 "accessor_class_list.gperf"
     {"bufr_data_array", &grib_accessor_class_bufr_data_array},
-    {""},
-#line 74 "accessor_class_list.gperf"
-    {"data_sh_unpacked", &grib_accessor_class_data_sh_unpacked},
-#line 41 "accessor_class_list.gperf"
+    {""}, {""},
+#line 40 "accessor_class_list.gperf"
     {"concept", &grib_accessor_class_concept},
-#line 158 "accessor_class_list.gperf"
+#line 157 "accessor_class_list.gperf"
     {"number_of_coded_values", &grib_accessor_class_number_of_coded_values},
-#line 25 "accessor_class_list.gperf"
+#line 24 "accessor_class_list.gperf"
     {"bufr_data_element", &grib_accessor_class_bufr_data_element},
-    {""},
-#line 75 "accessor_class_list.gperf"
-    {"data_shsimple_packing", &grib_accessor_class_data_shsimple_packing},
-#line 173 "accessor_class_list.gperf"
+    {""}, {""},
+#line 172 "accessor_class_list.gperf"
     {"position", &grib_accessor_class_position},
-#line 31 "accessor_class_list.gperf"
+#line 30 "accessor_class_list.gperf"
     {"bufr_simple_thinning", &grib_accessor_class_bufr_simple_thinning},
     {""},
-#line 195 "accessor_class_list.gperf"
+#line 194 "accessor_class_list.gperf"
     {"spectral_truncation", &grib_accessor_class_spectral_truncation},
-#line 33 "accessor_class_list.gperf"
+#line 32 "accessor_class_list.gperf"
     {"bufrdc_expanded_descriptors", &grib_accessor_class_bufrdc_expanded_descriptors},
 #line 20 "accessor_class_list.gperf"
     {"blob", &grib_accessor_class_blob},
 #line 21 "accessor_class_list.gperf"
     {"box", &grib_accessor_class_box},
-#line 42 "accessor_class_list.gperf"
+#line 41 "accessor_class_list.gperf"
     {"constant", &grib_accessor_class_constant},
-#line 133 "accessor_class_list.gperf"
+#line 132 "accessor_class_list.gperf"
     {"int64_little_endian", &grib_accessor_class_int64_little_endian},
-#line 13 "accessor_class_list.gperf"
-    {"array", &grib_accessor_class_array},
-#line 125 "accessor_class_list.gperf"
+#line 226 "accessor_class_list.gperf"
+    {"when", &grib_accessor_class_when},
+#line 124 "accessor_class_list.gperf"
     {"ibmfloat", &grib_accessor_class_ibmfloat},
-#line 129 "accessor_class_list.gperf"
+#line 128 "accessor_class_list.gperf"
     {"int16_little_endian", &grib_accessor_class_int16_little_endian},
-#line 122 "accessor_class_list.gperf"
-    {"gts_header", &grib_accessor_class_gts_header},
-#line 80 "accessor_class_list.gperf"
+    {""},
+#line 79 "accessor_class_list.gperf"
     {"divdouble", &grib_accessor_class_divdouble},
-    {""}, {""}, {""}, {""}, {""},
-#line 105 "accessor_class_list.gperf"
+    {""}, {""},
+#line 195 "accessor_class_list.gperf"
+    {"sprintf", &grib_accessor_class_sprintf},
+    {""}, {""},
+#line 104 "accessor_class_list.gperf"
     {"g2_mars_labeling", &grib_accessor_class_g2_mars_labeling},
-#line 121 "accessor_class_list.gperf"
+#line 120 "accessor_class_list.gperf"
     {"group", &grib_accessor_class_group},
     {""},
-#line 115 "accessor_class_list.gperf"
+#line 114 "accessor_class_list.gperf"
     {"gaussian_grid_name", &grib_accessor_class_gaussian_grid_name},
     {""},
-#line 60 "accessor_class_list.gperf"
+#line 59 "accessor_class_list.gperf"
     {"data_g1shsimple_packing", &grib_accessor_class_data_g1shsimple_packing},
-#line 149 "accessor_class_list.gperf"
+#line 148 "accessor_class_list.gperf"
     {"lookup", &grib_accessor_class_lookup},
-#line 202 "accessor_class_list.gperf"
+#line 201 "accessor_class_list.gperf"
     {"suppressed", &grib_accessor_class_suppressed},
     {""},
-#line 174 "accessor_class_list.gperf"
+#line 173 "accessor_class_list.gperf"
     {"proj_string", &grib_accessor_class_proj_string},
-    {""},
-#line 148 "accessor_class_list.gperf"
+#line 73 "accessor_class_list.gperf"
+    {"data_sh_unpacked", &grib_accessor_class_data_sh_unpacked},
+#line 147 "accessor_class_list.gperf"
     {"longitudes", &grib_accessor_class_longitudes},
     {""}, {""},
-#line 32 "accessor_class_list.gperf"
+#line 31 "accessor_class_list.gperf"
     {"bufr_string_values", &grib_accessor_class_bufr_string_values},
-    {""},
-#line 61 "accessor_class_list.gperf"
+#line 74 "accessor_class_list.gperf"
+    {"data_shsimple_packing", &grib_accessor_class_data_shsimple_packing},
+#line 60 "accessor_class_list.gperf"
     {"data_g1simple_packing", &grib_accessor_class_data_g1simple_packing},
-#line 54 "accessor_class_list.gperf"
+#line 53 "accessor_class_list.gperf"
     {"data_g1complex_packing", &grib_accessor_class_data_g1complex_packing},
     {""},
-#line 131 "accessor_class_list.gperf"
+#line 130 "accessor_class_list.gperf"
     {"int32_little_endian", &grib_accessor_class_int32_little_endian},
     {""}, {""},
-#line 178 "accessor_class_list.gperf"
+#line 177 "accessor_class_list.gperf"
     {"round", &grib_accessor_class_round},
-    {""}, {""},
-#line 92 "accessor_class_list.gperf"
-    {"g1date", &grib_accessor_class_g1date},
-#line 90 "accessor_class_list.gperf"
-    {"g1area", &grib_accessor_class_g1area},
+#line 12 "accessor_class_list.gperf"
+    {"apply_operators", &grib_accessor_class_apply_operators},
+    {""},
 #line 91 "accessor_class_list.gperf"
-    {"g1bitmap", &grib_accessor_class_g1bitmap},
-    {""}, {""}, {""}, {""},
-#line 107 "accessor_class_list.gperf"
-    {"g2bitmap_present", &grib_accessor_class_g2bitmap_present},
-#line 211 "accessor_class_list.gperf"
-    {"uint16", &grib_accessor_class_uint16},
-    {""},
-#line 124 "accessor_class_list.gperf"
-    {"headers_only", &grib_accessor_class_headers_only},
-#line 46 "accessor_class_list.gperf"
-    {"data_2order_packing", &grib_accessor_class_data_2order_packing},
-#line 73 "accessor_class_list.gperf"
-    {"data_sh_packed", &grib_accessor_class_data_sh_packed},
-    {""}, {""},
-#line 88 "accessor_class_list.gperf"
-    {"g1_message_length", &grib_accessor_class_g1_message_length},
-    {""},
+    {"g1date", &grib_accessor_class_g1date},
 #line 89 "accessor_class_list.gperf"
-    {"g1_section4_length", &grib_accessor_class_g1_section4_length},
-#line 196 "accessor_class_list.gperf"
-    {"sprintf", &grib_accessor_class_sprintf},
-#line 23 "accessor_class_list.gperf"
-    {"bufr_clear_tables", &grib_accessor_class_bufr_clear_tables},
-    {""},
-#line 224 "accessor_class_list.gperf"
-    {"values", &grib_accessor_class_values},
-    {""},
+    {"g1area", &grib_accessor_class_g1area},
+#line 90 "accessor_class_list.gperf"
+    {"g1bitmap", &grib_accessor_class_g1bitmap},
+#line 121 "accessor_class_list.gperf"
+    {"gts_header", &grib_accessor_class_gts_header},
+#line 33 "accessor_class_list.gperf"
+    {"bytes", &grib_accessor_class_bytes},
+    {""}, {""},
+#line 106 "accessor_class_list.gperf"
+    {"g2bitmap_present", &grib_accessor_class_g2bitmap_present},
+#line 210 "accessor_class_list.gperf"
+    {"uint16", &grib_accessor_class_uint16},
+    {""}, {""},
 #line 45 "accessor_class_list.gperf"
-    {"count_total", &grib_accessor_class_count_total},
-#line 212 "accessor_class_list.gperf"
-    {"uint16_little_endian", &grib_accessor_class_uint16_little_endian},
-    {""}, {""},
-#line 222 "accessor_class_list.gperf"
-    {"validity_date", &grib_accessor_class_validity_date},
-#line 223 "accessor_class_list.gperf"
-    {"validity_time", &grib_accessor_class_validity_time},
-#line 145 "accessor_class_list.gperf"
-    {"local_definition", &grib_accessor_class_local_definition},
-    {""},
-#line 29 "accessor_class_list.gperf"
-    {"bufr_extract_subsets", &grib_accessor_class_bufr_extract_subsets},
-    {""}, {""}, {""},
-#line 26 "accessor_class_list.gperf"
-    {"bufr_elements_table", &grib_accessor_class_bufr_elements_table},
-#line 27 "accessor_class_list.gperf"
-    {"bufr_extract_area_subsets", &grib_accessor_class_bufr_extract_area_subsets},
-    {""}, {""}, {""},
-#line 28 "accessor_class_list.gperf"
-    {"bufr_extract_datetime_subsets", &grib_accessor_class_bufr_extract_datetime_subsets},
-#line 205 "accessor_class_list.gperf"
-    {"to_double", &grib_accessor_class_to_double},
-    {""},
-#line 100 "accessor_class_list.gperf"
-    {"g1step_range", &grib_accessor_class_g1step_range},
-    {""},
-#line 144 "accessor_class_list.gperf"
-    {"library_version", &grib_accessor_class_library_version},
-    {""}, {""},
-#line 38 "accessor_class_list.gperf"
-    {"codetable", &grib_accessor_class_codetable},
-    {""},
-#line 59 "accessor_class_list.gperf"
-    {"data_g1secondary_bitmap", &grib_accessor_class_data_g1secondary_bitmap},
-    {""}, {""}, {""}, {""}, {""},
-#line 39 "accessor_class_list.gperf"
-    {"codetable_title", &grib_accessor_class_codetable_title},
-    {""},
-#line 85 "accessor_class_list.gperf"
+    {"data_2order_packing", &grib_accessor_class_data_2order_packing},
+#line 84 "accessor_class_list.gperf"
     {"forward", &grib_accessor_class_forward},
     {""}, {""},
-#line 123 "accessor_class_list.gperf"
-    {"hash_array", &grib_accessor_class_hash_array},
-#line 57 "accessor_class_list.gperf"
-    {"data_g1second_order_general_packing", &grib_accessor_class_data_g1second_order_general_packing},
+#line 87 "accessor_class_list.gperf"
+    {"g1_message_length", &grib_accessor_class_g1_message_length},
     {""},
-#line 126 "accessor_class_list.gperf"
+#line 88 "accessor_class_list.gperf"
+    {"g1_section4_length", &grib_accessor_class_g1_section4_length},
+#line 125 "accessor_class_list.gperf"
     {"ieeefloat", &grib_accessor_class_ieeefloat},
-#line 58 "accessor_class_list.gperf"
-    {"data_g1second_order_row_by_row_packing", &grib_accessor_class_data_g1second_order_row_by_row_packing},
+#line 223 "accessor_class_list.gperf"
+    {"values", &grib_accessor_class_values},
     {""}, {""},
-#line 165 "accessor_class_list.gperf"
+#line 164 "accessor_class_list.gperf"
     {"offset_file", &grib_accessor_class_offset_file},
-#line 55 "accessor_class_list.gperf"
-    {"data_g1second_order_constant_width_packing", &grib_accessor_class_data_g1second_order_constant_width_packing},
-#line 83 "accessor_class_list.gperf"
-    {"evaluate", &grib_accessor_class_evaluate},
-#line 56 "accessor_class_list.gperf"
-    {"data_g1second_order_general_extended_packing", &grib_accessor_class_data_g1second_order_general_extended_packing},
+#line 44 "accessor_class_list.gperf"
+    {"count_total", &grib_accessor_class_count_total},
+#line 211 "accessor_class_list.gperf"
+    {"uint16_little_endian", &grib_accessor_class_uint16_little_endian},
+#line 221 "accessor_class_list.gperf"
+    {"validity_date", &grib_accessor_class_validity_date},
+#line 222 "accessor_class_list.gperf"
+    {"validity_time", &grib_accessor_class_validity_time},
+    {""}, {""},
+#line 144 "accessor_class_list.gperf"
+    {"local_definition", &grib_accessor_class_local_definition},
     {""},
-#line 35 "accessor_class_list.gperf"
-    {"change_scanning_direction", &grib_accessor_class_change_scanning_direction},
-#line 30 "accessor_class_list.gperf"
-    {"bufr_group", &grib_accessor_class_bufr_group},
-#line 147 "accessor_class_list.gperf"
-    {"long_vector", &grib_accessor_class_long_vector},
-#line 219 "accessor_class_list.gperf"
-    {"unpack_bufr_values", &grib_accessor_class_unpack_bufr_values},
-#line 142 "accessor_class_list.gperf"
-    {"latlon_increment", &grib_accessor_class_latlon_increment},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 167 "accessor_class_list.gperf"
-    {"pack_bufr_values", &grib_accessor_class_pack_bufr_values},
-#line 163 "accessor_class_list.gperf"
-    {"octahedral_gaussian", &grib_accessor_class_octahedral_gaussian},
-#line 225 "accessor_class_list.gperf"
-    {"variable", &grib_accessor_class_variable},
-#line 161 "accessor_class_list.gperf"
-    {"number_of_values", &grib_accessor_class_number_of_values},
-    {""},
-#line 226 "accessor_class_list.gperf"
-    {"vector", &grib_accessor_class_vector},
-    {""}, {""}, {""}, {""}, {""}, {""},
-#line 40 "accessor_class_list.gperf"
-    {"codetable_units", &grib_accessor_class_codetable_units},
-    {""},
-#line 138 "accessor_class_list.gperf"
-    {"ksec1expver", &grib_accessor_class_ksec1expver},
-#line 94 "accessor_class_list.gperf"
-    {"g1end_of_interval_monthly", &grib_accessor_class_g1end_of_interval_monthly},
+#line 28 "accessor_class_list.gperf"
+    {"bufr_extract_subsets", &grib_accessor_class_bufr_extract_subsets},
+    {""}, {""},
+#line 13 "accessor_class_list.gperf"
+    {"array", &grib_accessor_class_array},
+#line 25 "accessor_class_list.gperf"
+    {"bufr_elements_table", &grib_accessor_class_bufr_elements_table},
+#line 26 "accessor_class_list.gperf"
+    {"bufr_extract_area_subsets", &grib_accessor_class_bufr_extract_area_subsets},
     {""}, {""}, {""},
-#line 171 "accessor_class_list.gperf"
-    {"padtoeven", &grib_accessor_class_padtoeven},
-#line 162 "accessor_class_list.gperf"
-    {"number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing},
+#line 27 "accessor_class_list.gperf"
+    {"bufr_extract_datetime_subsets", &grib_accessor_class_bufr_extract_datetime_subsets},
+#line 204 "accessor_class_list.gperf"
+    {"to_double", &grib_accessor_class_to_double},
     {""},
-#line 152 "accessor_class_list.gperf"
+#line 99 "accessor_class_list.gperf"
+    {"g1step_range", &grib_accessor_class_g1step_range},
+    {""},
+#line 123 "accessor_class_list.gperf"
+    {"headers_only", &grib_accessor_class_headers_only},
+    {""},
+#line 72 "accessor_class_list.gperf"
+    {"data_sh_packed", &grib_accessor_class_data_sh_packed},
+#line 37 "accessor_class_list.gperf"
+    {"codetable", &grib_accessor_class_codetable},
+    {""},
+#line 58 "accessor_class_list.gperf"
+    {"data_g1secondary_bitmap", &grib_accessor_class_data_g1secondary_bitmap},
+    {""}, {""}, {""}, {""}, {""},
+#line 38 "accessor_class_list.gperf"
+    {"codetable_title", &grib_accessor_class_codetable_title},
+    {""}, {""}, {""}, {""}, {""},
+#line 56 "accessor_class_list.gperf"
+    {"data_g1second_order_general_packing", &grib_accessor_class_data_g1second_order_general_packing},
+    {""}, {""},
+#line 57 "accessor_class_list.gperf"
+    {"data_g1second_order_row_by_row_packing", &grib_accessor_class_data_g1second_order_row_by_row_packing},
+#line 165 "accessor_class_list.gperf"
+    {"offset_values", &grib_accessor_class_offset_values},
+    {""},
+#line 82 "accessor_class_list.gperf"
+    {"evaluate", &grib_accessor_class_evaluate},
+#line 54 "accessor_class_list.gperf"
+    {"data_g1second_order_constant_width_packing", &grib_accessor_class_data_g1second_order_constant_width_packing},
+    {""},
+#line 55 "accessor_class_list.gperf"
+    {"data_g1second_order_general_extended_packing", &grib_accessor_class_data_g1second_order_general_extended_packing},
+    {""}, {""},
+#line 29 "accessor_class_list.gperf"
+    {"bufr_group", &grib_accessor_class_bufr_group},
+#line 146 "accessor_class_list.gperf"
+    {"long_vector", &grib_accessor_class_long_vector},
+#line 218 "accessor_class_list.gperf"
+    {"unpack_bufr_values", &grib_accessor_class_unpack_bufr_values},
+#line 141 "accessor_class_list.gperf"
+    {"latlon_increment", &grib_accessor_class_latlon_increment},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 166 "accessor_class_list.gperf"
+    {"pack_bufr_values", &grib_accessor_class_pack_bufr_values},
+    {""},
+#line 224 "accessor_class_list.gperf"
+    {"variable", &grib_accessor_class_variable},
+#line 160 "accessor_class_list.gperf"
+    {"number_of_values", &grib_accessor_class_number_of_values},
+#line 126 "accessor_class_list.gperf"
+    {"ifs_param", &grib_accessor_class_ifs_param},
+#line 225 "accessor_class_list.gperf"
+    {"vector", &grib_accessor_class_vector},
+#line 36 "accessor_class_list.gperf"
+    {"codeflag", &grib_accessor_class_codeflag},
+    {""},
+#line 151 "accessor_class_list.gperf"
     {"md5", &grib_accessor_class_md5},
     {""},
-#line 180 "accessor_class_list.gperf"
-    {"scale_values", &grib_accessor_class_scale_values},
-#line 166 "accessor_class_list.gperf"
-    {"offset_values", &grib_accessor_class_offset_values},
+#line 42 "accessor_class_list.gperf"
+    {"count_file", &grib_accessor_class_count_file},
+#line 122 "accessor_class_list.gperf"
+    {"hash_array", &grib_accessor_class_hash_array},
     {""}, {""},
+#line 39 "accessor_class_list.gperf"
+    {"codetable_units", &grib_accessor_class_codetable_units},
+#line 149 "accessor_class_list.gperf"
+    {"mars_param", &grib_accessor_class_mars_param},
+#line 150 "accessor_class_list.gperf"
+    {"mars_step", &grib_accessor_class_mars_step},
+#line 93 "accessor_class_list.gperf"
+    {"g1end_of_interval_monthly", &grib_accessor_class_g1end_of_interval_monthly},
+#line 152 "accessor_class_list.gperf"
+    {"message", &grib_accessor_class_message},
+#line 170 "accessor_class_list.gperf"
+    {"padtoeven", &grib_accessor_class_padtoeven},
+#line 161 "accessor_class_list.gperf"
+    {"number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing},
+#line 137 "accessor_class_list.gperf"
+    {"ksec1expver", &grib_accessor_class_ksec1expver},
+    {""},
+#line 34 "accessor_class_list.gperf"
+    {"change_scanning_direction", &grib_accessor_class_change_scanning_direction},
+#line 179 "accessor_class_list.gperf"
+    {"scale_values", &grib_accessor_class_scale_values},
+    {""},
+#line 191 "accessor_class_list.gperf"
+    {"smart_table", &grib_accessor_class_smart_table},
+    {""}, {""},
+#line 143 "accessor_class_list.gperf"
+    {"library_version", &grib_accessor_class_library_version},
 #line 11 "accessor_class_list.gperf"
     {"abstract_vector", &grib_accessor_class_abstract_vector},
-#line 150 "accessor_class_list.gperf"
-    {"mars_param", &grib_accessor_class_mars_param},
-#line 151 "accessor_class_list.gperf"
-    {"mars_step", &grib_accessor_class_mars_step},
-    {""},
-#line 153 "accessor_class_list.gperf"
-    {"message", &grib_accessor_class_message},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""},
 #line 192 "accessor_class_list.gperf"
-    {"smart_table", &grib_accessor_class_smart_table},
-#line 164 "accessor_class_list.gperf"
-    {"octect_number", &grib_accessor_class_octect_number},
-    {""}, {""}, {""}, {""}, {""},
-#line 193 "accessor_class_list.gperf"
     {"smart_table_column", &grib_accessor_class_smart_table_column},
-#line 127 "accessor_class_list.gperf"
-    {"ifs_param", &grib_accessor_class_ifs_param},
-    {""},
-#line 37 "accessor_class_list.gperf"
-    {"codeflag", &grib_accessor_class_codeflag},
-#line 154 "accessor_class_list.gperf"
-    {"message_copy", &grib_accessor_class_message_copy},
-    {""}, {""},
-#line 43 "accessor_class_list.gperf"
-    {"count_file", &grib_accessor_class_count_file},
-    {""}, {""}, {""}, {""}, {""},
-#line 95 "accessor_class_list.gperf"
-    {"g1fcperiod", &grib_accessor_class_g1fcperiod},
-    {""},
-#line 97 "accessor_class_list.gperf"
-    {"g1monthlydate", &grib_accessor_class_g1monthlydate},
-    {""},
-#line 155 "accessor_class_list.gperf"
-    {"missing", &grib_accessor_class_missing},
-#line 36 "accessor_class_list.gperf"
-    {"check_internal_version", &grib_accessor_class_check_internal_version},
     {""}, {""}, {""},
-#line 112 "accessor_class_list.gperf"
-    {"g2level", &grib_accessor_class_g2level},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""},
-#line 143 "accessor_class_list.gperf"
-    {"latlonvalues", &grib_accessor_class_latlonvalues},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 153 "accessor_class_list.gperf"
+    {"message_copy", &grib_accessor_class_message_copy},
+#line 162 "accessor_class_list.gperf"
+    {"octahedral_gaussian", &grib_accessor_class_octahedral_gaussian},
+    {""}, {""}, {""}, {""},
+#line 163 "accessor_class_list.gperf"
+    {"octect_number", &grib_accessor_class_octect_number},
+    {""}, {""}, {""}, {""}, {""}, {""},
+#line 154 "accessor_class_list.gperf"
+    {"missing", &grib_accessor_class_missing},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""},
-#line 10 "accessor_class_list.gperf"
-    {"abstract_long_vector", &grib_accessor_class_abstract_long_vector},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 77 "accessor_class_list.gperf"
-    {"decimal_precision", &grib_accessor_class_decimal_precision},
+#line 94 "accessor_class_list.gperf"
+    {"g1fcperiod", &grib_accessor_class_g1fcperiod},
     {""}, {""}, {""}, {""}, {""}, {""},
-#line 87 "accessor_class_list.gperf"
-    {"g1_half_byte_codeflag", &grib_accessor_class_g1_half_byte_codeflag},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 111 "accessor_class_list.gperf"
+    {"g2level", &grib_accessor_class_g2level},
     {""}, {""}, {""}, {""},
 #line 86 "accessor_class_list.gperf"
+    {"g1_half_byte_codeflag", &grib_accessor_class_g1_half_byte_codeflag},
+    {""}, {""}, {""}, {""}, {""},
+#line 142 "accessor_class_list.gperf"
+    {"latlonvalues", &grib_accessor_class_latlonvalues},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 85 "accessor_class_list.gperf"
     {"from_scale_factor_scaled_value", &grib_accessor_class_from_scale_factor_scaled_value},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 76 "accessor_class_list.gperf"
+    {"decimal_precision", &grib_accessor_class_decimal_precision},
+    {""},
+#line 96 "accessor_class_list.gperf"
+    {"g1monthlydate", &grib_accessor_class_g1monthlydate},
+    {""}, {""}, {""},
+#line 10 "accessor_class_list.gperf"
+    {"abstract_long_vector", &grib_accessor_class_abstract_long_vector},
+    {""}, {""}, {""},
+#line 35 "accessor_class_list.gperf"
+    {"check_internal_version", &grib_accessor_class_check_internal_version},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 93 "accessor_class_list.gperf"
-    {"g1day_of_the_year_date", &grib_accessor_class_g1day_of_the_year_date},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 44 "accessor_class_list.gperf"
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 43 "accessor_class_list.gperf"
     {"count_missing", &grib_accessor_class_count_missing},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""},
-#line 177 "accessor_class_list.gperf"
-    {"reference_value_error", &grib_accessor_class_reference_value_error},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""},
-#line 101 "accessor_class_list.gperf"
+#line 100 "accessor_class_list.gperf"
     {"g1verificationdate", &grib_accessor_class_g1verificationdate},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""},
+#line 176 "accessor_class_list.gperf"
+    {"reference_value_error", &grib_accessor_class_reference_value_error},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""},
-#line 103 "accessor_class_list.gperf"
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""},
+#line 92 "accessor_class_list.gperf"
+    {"g1day_of_the_year_date", &grib_accessor_class_g1day_of_the_year_date},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 102 "accessor_class_list.gperf"
     {"g2_chemical", &grib_accessor_class_g2_chemical},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -667,23 +668,18 @@ static const struct accessor_class_hash classes[] =
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""},
-#line 96 "accessor_class_list.gperf"
-    {"g1forecastmonth", &grib_accessor_class_g1forecastmonth},
-    {""}, {""},
-#line 99 "accessor_class_list.gperf"
-    {"g1number_of_coded_values_sh_simple", &grib_accessor_class_g1number_of_coded_values_sh_simple},
+    {""}, {""}, {""}, {""}, {""}, {""},
 #line 98 "accessor_class_list.gperf"
-    {"g1number_of_coded_values_sh_complex", &grib_accessor_class_g1number_of_coded_values_sh_complex}
+    {"g1number_of_coded_values_sh_simple", &grib_accessor_class_g1number_of_coded_values_sh_simple},
+#line 97 "accessor_class_list.gperf"
+    {"g1number_of_coded_values_sh_complex", &grib_accessor_class_g1number_of_coded_values_sh_complex},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {""}, {""}, {""}, {""}, {""},
+#line 95 "accessor_class_list.gperf"
+    {"g1forecastmonth", &grib_accessor_class_g1forecastmonth}
   };
 
 static const struct accessor_class_hash *
diff --git a/src/grib_accessor_factory.h b/src/grib_accessor_factory.h
index 0a69d9f7d..8537254f6 100644
--- a/src/grib_accessor_factory.h
+++ b/src/grib_accessor_factory.h
@@ -12,7 +12,6 @@
 { "blob", &grib_accessor_class_blob, },
 { "box", &grib_accessor_class_box, },
 { "budgdate", &grib_accessor_class_budgdate, },
-{ "bufr_clear_tables", &grib_accessor_class_bufr_clear_tables, },
 { "bufr_data_array", &grib_accessor_class_bufr_data_array, },
 { "bufr_data_element", &grib_accessor_class_bufr_data_element, },
 { "bufr_elements_table", &grib_accessor_class_bufr_elements_table, },
diff --git a/src/grib_accessor_factory_hash_list b/src/grib_accessor_factory_hash_list
index b3001ccac..c08be8c66 100644
--- a/src/grib_accessor_factory_hash_list
+++ b/src/grib_accessor_factory_hash_list
@@ -13,7 +13,6 @@ bits_per_value, &grib_accessor_class_bits_per_value
 blob, &grib_accessor_class_blob
 box, &grib_accessor_class_box
 budgdate, &grib_accessor_class_budgdate
-bufr_clear_tables, &grib_accessor_class_bufr_clear_tables
 bufr_data_array, &grib_accessor_class_bufr_data_array
 bufr_data_element, &grib_accessor_class_bufr_data_element
 bufr_elements_table, &grib_accessor_class_bufr_elements_table
diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h
index 0c8fcf17c..508bbec66 100644
--- a/src/grib_api_internal.h
+++ b/src/grib_api_internal.h
@@ -903,7 +903,7 @@ struct grib_handle
     long missingValueLong;
     double missingValueDouble;
     ProductKind product_kind;
-    grib_trie* bufr_elements_table;
+    /* grib_trie* bufr_elements_table; */
 };
 
 struct grib_multi_handle
diff --git a/src/grib_api_prototypes.h b/src/grib_api_prototypes.h
index a73e6ebfc..3fe136518 100644
--- a/src/grib_api_prototypes.h
+++ b/src/grib_api_prototypes.h
@@ -277,8 +277,6 @@ size_t grib_viarray_used_size(grib_viarray* v);
 
 /* grib_accessor_class_bits_per_value.c */
 
-/* grib_accessor_class_bufr_clear_tables.c */
-
 /* grib_accessor_class_bufr_data_array.c */
 grib_vsarray* accessor_bufr_data_array_get_stringValues(grib_accessor* a);
 grib_accessors_list* accessor_bufr_data_array_get_dataAccessors(grib_accessor* a);
diff --git a/windows/msvc/grib_api_lib/grib_api_lib.vcxproj b/windows/msvc/grib_api_lib/grib_api_lib.vcxproj
index 8c1662334..3ced87263 100755
--- a/windows/msvc/grib_api_lib/grib_api_lib.vcxproj
+++ b/windows/msvc/grib_api_lib/grib_api_lib.vcxproj
@@ -214,7 +214,6 @@
     <ClCompile Include="..\..\..\src\grib_accessor_class_box.c" />
     <ClCompile Include="..\..\..\src\grib_accessor_class_budgdate.c" />
     <ClCompile Include="..\..\..\src\grib_accessor_class_bufrdc_expanded_descriptors.c" />
-    <ClCompile Include="..\..\..\src\grib_accessor_class_bufr_clear_tables.c" />
     <ClCompile Include="..\..\..\src\grib_accessor_class_bufr_data_array.c" />
     <ClCompile Include="..\..\..\src\grib_accessor_class_bufr_data_element.c" />
     <ClCompile Include="..\..\..\src\grib_accessor_class_bufr_elements_table.c" />
diff --git a/windows/msvc/grib_api_lib/grib_api_lib.vcxproj.filters b/windows/msvc/grib_api_lib/grib_api_lib.vcxproj.filters
index c29bef4b7..289a58d1c 100755
--- a/windows/msvc/grib_api_lib/grib_api_lib.vcxproj.filters
+++ b/windows/msvc/grib_api_lib/grib_api_lib.vcxproj.filters
@@ -168,9 +168,6 @@
     <ClCompile Include="..\..\..\src\grib_accessor_class_budgdate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\grib_accessor_class_bufr_clear_tables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\grib_accessor_class_bufr_data_array.c">
       <Filter>Source Files</Filter>
     </ClCompile>