diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e6301fde..bc6d5d541 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -291,7 +291,6 @@ list( APPEND eccodes_src_files
     grib_filepool.cc
     grib_geography.cc
     grib_handle.cc
-    grib_header_compute.cc
     grib_hash_keys.cc
     grib_io.cc
     grib_trie.cc
diff --git a/src/grib_header_compute.cc b/src/deprecated/grib_header_compute.cc
similarity index 100%
rename from src/grib_header_compute.cc
rename to src/deprecated/grib_header_compute.cc
diff --git a/src/eccodes_prototypes.h b/src/eccodes_prototypes.h
index 78e51e65b..91706ed27 100644
--- a/src/eccodes_prototypes.h
+++ b/src/eccodes_prototypes.h
@@ -1070,11 +1070,6 @@ int grib_handle_prepare_action(grib_handle* h, grib_action* a);
 void grib_multi_support_reset_file(grib_context* c, FILE* f);
 void grib_multi_support_reset(grib_context* c);
 
-/* grib_header_compute.cc*/
-void print_math(grib_math* m);
-void grib_math_delete(grib_context* c, grib_math* m);
-grib_math* grib_math_new(grib_context* c, const char* formula, int* err);
-
 /* grib_hash_keys.cc*/
 const struct grib_keys_hash* grib_keys_hash_get(const char* str, size_t len);
 grib_itrie* grib_hash_keys_new(grib_context* c, int* count);
diff --git a/src/grib_db.cc b/src/grib_db.cc
index 84c941076..56571c104 100644
--- a/src/grib_db.cc
+++ b/src/grib_db.cc
@@ -449,12 +449,9 @@ int grib_db_apply_where(grib_fieldset* set)
     if (!set)
         return GRIB_INVALID_ARGUMENT;
 
-    /*
-  m=grib_math_new(set->context,where_string,&err);
-
-  print_math(m);
-  printf("\n");
-  */
+    // m=grib_math_new(set->context,where_string,&err);
+    // print_math(m);
+    // printf("\n");
 
     if (set->filter)
         grib_db_delete_int_array(set->filter);
diff --git a/src/grib_fieldset.cc b/src/grib_fieldset.cc
index 0c7ba5652..88eabeb7b 100644
--- a/src/grib_fieldset.cc
+++ b/src/grib_fieldset.cc
@@ -411,21 +411,16 @@ static grib_fieldset* grib_fieldset_create_from_order_by(grib_context* c, grib_o
     return set;
 }
 
-/* Experimental: Needs more work */
+// Experimental: Needs more work
 int grib_fieldset_apply_where(grib_fieldset* set, const char* where_string)
 {
-    int err      = GRIB_NOT_IMPLEMENTED;
-    grib_math* m = NULL;
+    // grib_math* m = NULL;
+    // m = grib_math_new(set->context, where_string, &err);
+    // if (err || !m) return err;
 
-    if (!set)
-        return GRIB_INVALID_ARGUMENT;
-
-    m = grib_math_new(set->context, where_string, &err);
-    if (err || !m) return err;
-
-    print_math(m);
-    printf("\n");
-    grib_math_delete(set->context, m);
+    // print_math(m);
+    // printf("\n");
+    // grib_math_delete(set->context, m);
     return GRIB_NOT_IMPLEMENTED;
 }