diff --git a/src/metkit/mars2grib/CoreOperations.h b/src/metkit/mars2grib/CoreOperations.h
index ea89c7f3..0853a62d 100644
--- a/src/metkit/mars2grib/CoreOperations.h
+++ b/src/metkit/mars2grib/CoreOperations.h
@@ -34,7 +34,6 @@
 /// @note: clang-format needs to be off here to preserve the logical grouping of
 /// includes and avoid unnecessary reordering that breaks the layering and dependencies.
 // clang-format off
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
 #include "metkit/mars2grib/backend/encodeValues.h"
diff --git a/src/metkit/mars2grib/backend/checks/checkDerivedProductDefinitionSection.h b/src/metkit/mars2grib/backend/checks/checkDerivedProductDefinitionSection.h
index faf10044..fbd83a7e 100644
--- a/src/metkit/mars2grib/backend/checks/checkDerivedProductDefinitionSection.h
+++ b/src/metkit/mars2grib/backend/checks/checkDerivedProductDefinitionSection.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -91,9 +90,6 @@ void check_DerivedProductDefinitionSection_or_throw(const OptDict_t& opt, const
         std::throw_with_nested(
             Mars2GribValidationException("Unable to validate Derived Product Definition Section", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/checkDestinELocalSection.h b/src/metkit/mars2grib/backend/checks/checkDestinELocalSection.h
index be00a349..f7a74934 100644
--- a/src/metkit/mars2grib/backend/checks/checkDestinELocalSection.h
+++ b/src/metkit/mars2grib/backend/checks/checkDestinELocalSection.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -100,9 +99,6 @@ void check_DestinELocalSection_or_throw(const OptDict_t& opt, const OutDict_t& o
         // Rethrow nested exceptions
         std::throw_with_nested(Mars2GribValidationException("Unable to validate DestinE Local Use Section", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/checkEnsembleProductDefinitionSection.h b/src/metkit/mars2grib/backend/checks/checkEnsembleProductDefinitionSection.h
index e70f79ec..abe433f9 100644
--- a/src/metkit/mars2grib/backend/checks/checkEnsembleProductDefinitionSection.h
+++ b/src/metkit/mars2grib/backend/checks/checkEnsembleProductDefinitionSection.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -93,9 +92,6 @@ void check_EnsembleProductDefinitionSection_or_throw(const OptDict_t& opt, const
         std::throw_with_nested(
             Mars2GribValidationException("Unable to validate Ensemble Product Definition Section", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/checkLocalUseSection.h b/src/metkit/mars2grib/backend/checks/checkLocalUseSection.h
index 5a460822..3b020c4e 100644
--- a/src/metkit/mars2grib/backend/checks/checkLocalUseSection.h
+++ b/src/metkit/mars2grib/backend/checks/checkLocalUseSection.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -86,9 +85,6 @@ void check_LocalUseSection_or_throw(const OptDict_t& opt, const OutDict_t& out)
         std::throw_with_nested(
             Mars2GribValidationException("Unable to validate presence of Local Use Section", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/checkStatisticsProductDefinitionSection.h b/src/metkit/mars2grib/backend/checks/checkStatisticsProductDefinitionSection.h
index 923d1df3..d5c4149c 100644
--- a/src/metkit/mars2grib/backend/checks/checkStatisticsProductDefinitionSection.h
+++ b/src/metkit/mars2grib/backend/checks/checkStatisticsProductDefinitionSection.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -90,9 +89,6 @@ void check_StatisticsProductDefinitionSection_or_throw(const OptDict_t& opt, con
         std::throw_with_nested(
             Mars2GribValidationException("Unable to validate Product Definition Section as Statistics type", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/matchDataRepresentationTemplateNumber.h b/src/metkit/mars2grib/backend/checks/matchDataRepresentationTemplateNumber.h
index 969b11e3..22f9176f 100644
--- a/src/metkit/mars2grib/backend/checks/matchDataRepresentationTemplateNumber.h
+++ b/src/metkit/mars2grib/backend/checks/matchDataRepresentationTemplateNumber.h
@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -105,9 +104,6 @@ void match_DataRepresentationTemplateNumber_or_throw(
         std::throw_with_nested(
             Mars2GribValidationException("Unable to validate Data Representation Template Number", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/matchDataset.h b/src/metkit/mars2grib/backend/checks/matchDataset.h
index 9b97a45c..c1e012c5 100644
--- a/src/metkit/mars2grib/backend/checks/matchDataset.h
+++ b/src/metkit/mars2grib/backend/checks/matchDataset.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -89,9 +88,6 @@ void match_Dataset_or_throw(const OptDict_t& opt, const OutDict_t& out, const st
         // Rethrow nested exceptions
         std::throw_with_nested(Mars2GribValidationException("Unable to validate dataset from the sample", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/matchGridDefinitionTemplateNumber.h b/src/metkit/mars2grib/backend/checks/matchGridDefinitionTemplateNumber.h
index cf5c74bf..4dbf8c3b 100644
--- a/src/metkit/mars2grib/backend/checks/matchGridDefinitionTemplateNumber.h
+++ b/src/metkit/mars2grib/backend/checks/matchGridDefinitionTemplateNumber.h
@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -104,9 +103,6 @@ void match_GridDefinitionTemplateNumber_or_throw(const OptDict_t& opt, const Out
         std::throw_with_nested(
             Mars2GribValidationException("Unable to validate Grid Definition Template Number", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/matchLocalDefinitionNumber.h b/src/metkit/mars2grib/backend/checks/matchLocalDefinitionNumber.h
index 7fb32742..970e266f 100644
--- a/src/metkit/mars2grib/backend/checks/matchLocalDefinitionNumber.h
+++ b/src/metkit/mars2grib/backend/checks/matchLocalDefinitionNumber.h
@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -113,9 +112,6 @@ void match_LocalDefinitionNumber_or_throw(const OptDict_t& opt, const OutDict_t&
         std::throw_with_nested(
             Mars2GribValidationException("Unable to validate Local Definition Number in Local Use Section", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/checks/matchProductDefinitionTemplateNumber.h b/src/metkit/mars2grib/backend/checks/matchProductDefinitionTemplateNumber.h
index 7aa63649..b13b91fd 100644
--- a/src/metkit/mars2grib/backend/checks/matchProductDefinitionTemplateNumber.h
+++ b/src/metkit/mars2grib/backend/checks/matchProductDefinitionTemplateNumber.h
@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -106,9 +105,6 @@ void match_ProductDefinitionTemplateNumber_or_throw(const OptDict_t& opt, const
         std::throw_with_nested(
             Mars2GribValidationException("Unable to validate Product Definition Template Number", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::validation
diff --git a/src/metkit/mars2grib/backend/compile-time-registry-engine/EntryVariantRegistry.h b/src/metkit/mars2grib/backend/compile-time-registry-engine/EntryVariantRegistry.h
index e3f6f74e..dbc123d3 100644
--- a/src/metkit/mars2grib/backend/compile-time-registry-engine/EntryVariantRegistry.h
+++ b/src/metkit/mars2grib/backend/compile-time-registry-engine/EntryVariantRegistry.h
@@ -93,7 +93,6 @@
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/utils.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::compile_time_registry_engine {
 
diff --git a/src/metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h b/src/metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h
index 60c8a2a5..30dab016 100644
--- a/src/metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h
+++ b/src/metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h
@@ -78,7 +78,6 @@
 
 // Project includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::compile_time_registry_engine {
 
diff --git a/src/metkit/mars2grib/backend/compile-time-registry-engine/common.h b/src/metkit/mars2grib/backend/compile-time-registry-engine/common.h
index c9534233..7cfbe016 100644
--- a/src/metkit/mars2grib/backend/compile-time-registry-engine/common.h
+++ b/src/metkit/mars2grib/backend/compile-time-registry-engine/common.h
@@ -42,7 +42,6 @@
 #include <utility>
 
 // Project includes
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::compile_time_registry_engine {
 
diff --git a/src/metkit/mars2grib/backend/compile-time-registry-engine/makeEntryCallbacksRegistry.h b/src/metkit/mars2grib/backend/compile-time-registry-engine/makeEntryCallbacksRegistry.h
index d1724761..082051a0 100644
--- a/src/metkit/mars2grib/backend/compile-time-registry-engine/makeEntryCallbacksRegistry.h
+++ b/src/metkit/mars2grib/backend/compile-time-registry-engine/makeEntryCallbacksRegistry.h
@@ -93,7 +93,6 @@
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/utils.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::compile_time_registry_engine {
 
diff --git a/src/metkit/mars2grib/backend/compile-time-registry-engine/makePhaseCallbacksRegistry.h b/src/metkit/mars2grib/backend/compile-time-registry-engine/makePhaseCallbacksRegistry.h
index 8c3881d2..b46fda9a 100644
--- a/src/metkit/mars2grib/backend/compile-time-registry-engine/makePhaseCallbacksRegistry.h
+++ b/src/metkit/mars2grib/backend/compile-time-registry-engine/makePhaseCallbacksRegistry.h
@@ -158,7 +158,6 @@
 // Project includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::compile_time_registry_engine {
 
diff --git a/src/metkit/mars2grib/backend/compile-time-registry-engine/makeVariantCallbacksRegistry.h b/src/metkit/mars2grib/backend/compile-time-registry-engine/makeVariantCallbacksRegistry.h
index 3569bcaa..1374f1ad 100644
--- a/src/metkit/mars2grib/backend/compile-time-registry-engine/makeVariantCallbacksRegistry.h
+++ b/src/metkit/mars2grib/backend/compile-time-registry-engine/makeVariantCallbacksRegistry.h
@@ -141,7 +141,6 @@
 // Project includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::compile_time_registry_engine {
diff --git a/src/metkit/mars2grib/backend/compile-time-registry-engine/utils.h b/src/metkit/mars2grib/backend/compile-time-registry-engine/utils.h
index ad5bf531..279099c5 100644
--- a/src/metkit/mars2grib/backend/compile-time-registry-engine/utils.h
+++ b/src/metkit/mars2grib/backend/compile-time-registry-engine/utils.h
@@ -80,7 +80,6 @@
 #include <utility>
 
 // Project includes
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::compile_time_registry_engine::detail {
 
diff --git a/src/metkit/mars2grib/backend/concepts/AllConcepts.h b/src/metkit/mars2grib/backend/concepts/AllConcepts.h
index f4b46c1e..18216480 100644
--- a/src/metkit/mars2grib/backend/concepts/AllConcepts.h
+++ b/src/metkit/mars2grib/backend/concepts/AllConcepts.h
@@ -90,7 +90,6 @@
 
 // Project includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/mars2grib/backend/concepts/analysis/analysisConceptDescriptor.h"
 #include "metkit/mars2grib/backend/concepts/composition/compositionConceptDescriptor.h"
diff --git a/src/metkit/mars2grib/backend/concepts/EncodingCallbacksRegistry.h b/src/metkit/mars2grib/backend/concepts/EncodingCallbacksRegistry.h
index c02c0ec4..9bfcade5 100644
--- a/src/metkit/mars2grib/backend/concepts/EncodingCallbacksRegistry.h
+++ b/src/metkit/mars2grib/backend/concepts/EncodingCallbacksRegistry.h
@@ -93,7 +93,6 @@
 #include "metkit/mars2grib/backend/compile-time-registry-engine/makePhaseCallbacksRegistry.h"
 #include "metkit/mars2grib/backend/concepts/AllConcepts.h"
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/GeneralRegistry.h b/src/metkit/mars2grib/backend/concepts/GeneralRegistry.h
index 91d59045..6c4d1cac 100644
--- a/src/metkit/mars2grib/backend/concepts/GeneralRegistry.h
+++ b/src/metkit/mars2grib/backend/concepts/GeneralRegistry.h
@@ -103,7 +103,6 @@
 #include "metkit/mars2grib/backend/compile-time-registry-engine/EntryVariantRegistry.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/AllConcepts.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/MatchingCallbacksRegistry.h b/src/metkit/mars2grib/backend/concepts/MatchingCallbacksRegistry.h
index bff38d54..8d120c20 100644
--- a/src/metkit/mars2grib/backend/concepts/MatchingCallbacksRegistry.h
+++ b/src/metkit/mars2grib/backend/concepts/MatchingCallbacksRegistry.h
@@ -97,7 +97,6 @@
 #include "metkit/mars2grib/backend/compile-time-registry-engine/makeEntryCallbacksRegistry.h"
 #include "metkit/mars2grib/backend/concepts/AllConcepts.h"
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/analysis/analysisConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/analysis/analysisConceptDescriptor.h
index 1232b934..8052a3d2 100644
--- a/src/metkit/mars2grib/backend/concepts/analysis/analysisConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/analysis/analysisConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/analysis/analysisEncoding.h"
@@ -123,16 +122,9 @@ struct AnalysisConcept : RegisterEntryDescriptor<AnalysisType, AnalysisList> {
             if constexpr (analysisApplicable<Stage, Sec, Variant>()) {
                 return &AnalysisOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        // Avoid compiler warnings
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/analysis/analysisEncoding.h b/src/metkit/mars2grib/backend/concepts/analysis/analysisEncoding.h
index ce8140cc..51365e7b 100644
--- a/src/metkit/mars2grib/backend/concepts/analysis/analysisEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/analysis/analysisEncoding.h
@@ -42,7 +42,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/analysis/analysisEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/lengthOfTimeWindow.h"
@@ -177,9 +176,6 @@ void AnalysisOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& o
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(analysis, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/analysis/analysisEnum.h b/src/metkit/mars2grib/backend/concepts/analysis/analysisEnum.h
index c2b8b6a5..d7e66bd1 100644
--- a/src/metkit/mars2grib/backend/concepts/analysis/analysisEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/analysis/analysisEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/analysis/analysisMatcher.h b/src/metkit/mars2grib/backend/concepts/analysis/analysisMatcher.h
index fdfaeb75..203cbd44 100644
--- a/src/metkit/mars2grib/backend/concepts/analysis/analysisMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/analysis/analysisMatcher.h
@@ -6,7 +6,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/analysis/analysisEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/composition/compositionConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/composition/compositionConceptDescriptor.h
index 81c4bc1e..10912244 100644
--- a/src/metkit/mars2grib/backend/concepts/composition/compositionConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/composition/compositionConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/composition/compositionEncoding.h"
@@ -123,16 +122,9 @@ struct CompositionConcept : RegisterEntryDescriptor<CompositionType, Composition
             if constexpr (compositionApplicable<Stage, Sec, Variant>()) {
                 return &CompositionOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        // Avoid compiler warnings
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/composition/compositionEncoding.h b/src/metkit/mars2grib/backend/concepts/composition/compositionEncoding.h
index 6a997cc1..def53d8e 100644
--- a/src/metkit/mars2grib/backend/concepts/composition/compositionEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/composition/compositionEncoding.h
@@ -45,7 +45,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/composition/compositionEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/constituentType.h"
@@ -173,9 +172,6 @@ void CompositionOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(composition, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/composition/compositionEnum.h b/src/metkit/mars2grib/backend/concepts/composition/compositionEnum.h
index 77ffcd53..bf5b34dc 100644
--- a/src/metkit/mars2grib/backend/concepts/composition/compositionEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/composition/compositionEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/composition/compositionMatcher.h b/src/metkit/mars2grib/backend/concepts/composition/compositionMatcher.h
index 2a657c97..f109ead9 100644
--- a/src/metkit/mars2grib/backend/concepts/composition/compositionMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/composition/compositionMatcher.h
@@ -6,7 +6,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/composition/compositionEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/data-type/dataTypeConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/data-type/dataTypeConceptDescriptor.h
index 88cb6832..0adafdb4 100644
--- a/src/metkit/mars2grib/backend/concepts/data-type/dataTypeConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/data-type/dataTypeConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/data-type/dataTypeEncoding.h"
@@ -123,16 +122,9 @@ struct DataTypeConcept : RegisterEntryDescriptor<DataTypeType, DataTypeList> {
             if constexpr (dataTypeApplicable<Stage, Sec, Variant>()) {
                 return &DataTypeOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        // Avoid compiler warnings
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/data-type/dataTypeEncoding.h b/src/metkit/mars2grib/backend/concepts/data-type/dataTypeEncoding.h
index 63fc433c..31556d66 100644
--- a/src/metkit/mars2grib/backend/concepts/data-type/dataTypeEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/data-type/dataTypeEncoding.h
@@ -49,7 +49,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/data-type/dataTypeEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/productionStatusOfProcessedData.h"
@@ -181,9 +180,6 @@ void DataTypeOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& o
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(dataType, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/data-type/dataTypeEnum.h b/src/metkit/mars2grib/backend/concepts/data-type/dataTypeEnum.h
index 7d7b7726..1c031e16 100644
--- a/src/metkit/mars2grib/backend/concepts/data-type/dataTypeEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/data-type/dataTypeEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/data-type/dataTypeMatcher.h b/src/metkit/mars2grib/backend/concepts/data-type/dataTypeMatcher.h
index 14f3fdee..46aecb1b 100644
--- a/src/metkit/mars2grib/backend/concepts/data-type/dataTypeMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/data-type/dataTypeMatcher.h
@@ -5,7 +5,6 @@
 
 // Utils
 #include "metkit/mars2grib/backend/concepts/data-type/dataTypeEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/derived/derivedConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/derived/derivedConceptDescriptor.h
index c0f54669..49b6b349 100644
--- a/src/metkit/mars2grib/backend/concepts/derived/derivedConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/derived/derivedConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/derived/derivedEncoding.h"
@@ -123,16 +122,9 @@ struct DerivedConcept : RegisterEntryDescriptor<DerivedType, DerivedList> {
             if constexpr (derivedApplicable<Stage, Sec, Variant>()) {
                 return &DerivedOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        // Avoid compiler warnings
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/derived/derivedEncoding.h b/src/metkit/mars2grib/backend/concepts/derived/derivedEncoding.h
index 30597585..4837a6c5 100644
--- a/src/metkit/mars2grib/backend/concepts/derived/derivedEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/derived/derivedEncoding.h
@@ -48,7 +48,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/derived/derivedEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/derivedForecast.h"
@@ -179,9 +178,6 @@ void DerivedOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& op
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(derived, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/derived/derivedEnum.h b/src/metkit/mars2grib/backend/concepts/derived/derivedEnum.h
index 5971d7e9..23ab94f1 100644
--- a/src/metkit/mars2grib/backend/concepts/derived/derivedEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/derived/derivedEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/derived/derivedMatcher.h b/src/metkit/mars2grib/backend/concepts/derived/derivedMatcher.h
index 815ed738..6556588b 100644
--- a/src/metkit/mars2grib/backend/concepts/derived/derivedMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/derived/derivedMatcher.h
@@ -7,7 +7,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/derived/derivedEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/destine/destineConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/destine/destineConceptDescriptor.h
index 6416df99..7fa1dece 100644
--- a/src/metkit/mars2grib/backend/concepts/destine/destineConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/destine/destineConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/destine/destineEncoding.h"
@@ -123,16 +122,9 @@ struct DestineConcept : RegisterEntryDescriptor<DestineType, DestineList> {
             if constexpr (destineApplicable<Stage, Sec, Variant>()) {
                 return &DestineOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        // Avoid compiler warnings
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/destine/destineEncoding.h b/src/metkit/mars2grib/backend/concepts/destine/destineEncoding.h
index d91115ad..a1ea2c42 100644
--- a/src/metkit/mars2grib/backend/concepts/destine/destineEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/destine/destineEncoding.h
@@ -55,7 +55,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/destine/destineEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/activity.h"
@@ -229,9 +228,6 @@ void DestineOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& op
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(destine, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/destine/destineEnum.h b/src/metkit/mars2grib/backend/concepts/destine/destineEnum.h
index fbda7e41..b40a3bda 100644
--- a/src/metkit/mars2grib/backend/concepts/destine/destineEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/destine/destineEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/destine/destineMatcher.h b/src/metkit/mars2grib/backend/concepts/destine/destineMatcher.h
index a394e091..7928559e 100644
--- a/src/metkit/mars2grib/backend/concepts/destine/destineMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/destine/destineMatcher.h
@@ -7,7 +7,6 @@
 // Project includes
 #include "metkit/mars2grib/backend/concepts/destine/destineEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/ensemble/ensembleConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/ensemble/ensembleConceptDescriptor.h
index c0da44bb..2c0cd07f 100644
--- a/src/metkit/mars2grib/backend/concepts/ensemble/ensembleConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/ensemble/ensembleConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/ensemble/ensembleEncoding.h"
@@ -123,16 +122,9 @@ struct EnsembleConcept : RegisterEntryDescriptor<EnsembleType, EnsembleList> {
             if constexpr (ensembleApplicable<Stage, Sec, Variant>()) {
                 return &EnsembleOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        // Avoid compiler warnings
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/ensemble/ensembleEncoding.h b/src/metkit/mars2grib/backend/concepts/ensemble/ensembleEncoding.h
index 7cd71f5c..6eb8db5b 100644
--- a/src/metkit/mars2grib/backend/concepts/ensemble/ensembleEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/ensemble/ensembleEncoding.h
@@ -48,7 +48,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/ensemble/ensembleEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/numberOfForecastsInEnsemble.h"
@@ -191,9 +190,6 @@ void EnsembleOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& o
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(ensemble, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/ensemble/ensembleEnum.h b/src/metkit/mars2grib/backend/concepts/ensemble/ensembleEnum.h
index 37068365..f5556288 100644
--- a/src/metkit/mars2grib/backend/concepts/ensemble/ensembleEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/ensemble/ensembleEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/ensemble/ensembleMatcher.h b/src/metkit/mars2grib/backend/concepts/ensemble/ensembleMatcher.h
index c82e2b60..b6b4bacb 100644
--- a/src/metkit/mars2grib/backend/concepts/ensemble/ensembleMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/ensemble/ensembleMatcher.h
@@ -6,7 +6,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/ensemble/ensembleEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessConceptDescriptor.h
index f60a6fd7..4a92e47d 100644
--- a/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/generating-process/generatingProcessEncoding.h"
@@ -123,16 +122,9 @@ struct GeneratingProcessConcept : RegisterEntryDescriptor<GeneratingProcessType,
             if constexpr (generatingProcessApplicable<Stage, Sec, Variant>()) {
                 return &GeneratingProcessOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        // Avoid compiler warnings
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessEncoding.h b/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessEncoding.h
index e02f5b97..9a60915e 100644
--- a/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessEncoding.h
@@ -49,7 +49,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/generating-process/generatingProcessEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Tables
 #include "metkit/mars2grib/backend/tables/backgroundProcess.h"
@@ -211,10 +210,6 @@ void GeneratingProcessOp(const MarsDict_t& mars, const ParDict_t& par, const Opt
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(generatingProcess, "Concept called when not applicable...");
-
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessEnum.h b/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessEnum.h
index 608c7d15..c55918dd 100644
--- a/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessMatcher.h b/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessMatcher.h
index 2bb32c7f..86443a11 100644
--- a/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/generating-process/generatingProcessMatcher.h
@@ -5,7 +5,6 @@
 
 // Utils
 #include "metkit/mars2grib/backend/concepts/generating-process/generatingProcessEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/level/levelConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/level/levelConceptDescriptor.h
index a2d50e63..1e4ad346 100644
--- a/src/metkit/mars2grib/backend/concepts/level/levelConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/level/levelConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/level/levelEncoding.h"
@@ -123,16 +122,9 @@ struct LevelConcept : RegisterEntryDescriptor<LevelType, LevelList> {
             if constexpr (levelApplicable<Stage, Sec, Variant>()) {
                 return &LevelOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        // Avoid compiler warnings
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/level/levelEncoding.h b/src/metkit/mars2grib/backend/concepts/level/levelEncoding.h
index 9efdb362..fb8f03a6 100644
--- a/src/metkit/mars2grib/backend/concepts/level/levelEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/level/levelEncoding.h
@@ -51,7 +51,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/level/levelEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/level.h"
@@ -80,12 +79,7 @@ constexpr bool needPv() {
     if constexpr (Variant == LevelType::Hybrid) {
         return true;
     }
-    else {
-        return false;
-    }
-
-    // Remove compiler warning
-    mars2gribUnreachable();
+    return false;
 }
 
 ///
@@ -109,12 +103,7 @@ constexpr bool needLevel() {
                   Variant == LevelType::PotentialVorticity || Variant == LevelType::Theta) {
         return true;
     }
-    else {
-        return false;
-    }
-
-    // Remove compiler warning
-    mars2gribUnreachable();
+    return false;
 }
 
 ///
@@ -134,12 +123,7 @@ constexpr bool needTopBottomLevel() {
                   Variant == LevelType::SnowLayer) {
         return true;
     }
-    else {
-        return false;
-    }
-
-    // Remove compiler warning
-    mars2gribUnreachable();
+    return false;
 }
 
 
@@ -316,9 +300,6 @@ void LevelOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& opt,
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(level, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/level/levelEnum.h b/src/metkit/mars2grib/backend/concepts/level/levelEnum.h
index 66b20af2..fa979215 100644
--- a/src/metkit/mars2grib/backend/concepts/level/levelEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/level/levelEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/level/levelMatcher.h b/src/metkit/mars2grib/backend/concepts/level/levelMatcher.h
index 31aaa55a..277e21af 100644
--- a/src/metkit/mars2grib/backend/concepts/level/levelMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/level/levelMatcher.h
@@ -17,7 +17,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/level/levelEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 #include "metkit/mars2grib/utils/paramMatcher.h"
 
diff --git a/src/metkit/mars2grib/backend/concepts/longrange/longrangeConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/longrange/longrangeConceptDescriptor.h
index fb037647..75b359c2 100644
--- a/src/metkit/mars2grib/backend/concepts/longrange/longrangeConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/longrange/longrangeConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/longrange/longrangeEncoding.h"
@@ -123,15 +122,9 @@ struct LongrangeConcept : RegisterEntryDescriptor<LongrangeType, LongrangeList>
             if constexpr (longrangeApplicable<Stage, Sec, Variant>()) {
                 return &LongrangeOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/longrange/longrangeEncoding.h b/src/metkit/mars2grib/backend/concepts/longrange/longrangeEncoding.h
index 0a424bfe..de4b0f55 100644
--- a/src/metkit/mars2grib/backend/concepts/longrange/longrangeEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/longrange/longrangeEncoding.h
@@ -44,7 +44,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/longrange/longrangeEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/methodNumber.h"
@@ -166,9 +165,6 @@ void LongrangeOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t&
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(longrange, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/longrange/longrangeEnum.h b/src/metkit/mars2grib/backend/concepts/longrange/longrangeEnum.h
index d1bea0d7..b95e8653 100644
--- a/src/metkit/mars2grib/backend/concepts/longrange/longrangeEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/longrange/longrangeEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/longrange/longrangeMatcher.h b/src/metkit/mars2grib/backend/concepts/longrange/longrangeMatcher.h
index 056938d5..1f24176c 100644
--- a/src/metkit/mars2grib/backend/concepts/longrange/longrangeMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/longrange/longrangeMatcher.h
@@ -7,7 +7,6 @@
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/backend/concepts/longrange/longrangeEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/mars/marsConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/mars/marsConceptDescriptor.h
index 91092435..d72dc78c 100644
--- a/src/metkit/mars2grib/backend/concepts/mars/marsConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/mars/marsConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/mars/marsEncoding.h"
@@ -123,15 +122,9 @@ struct MarsConcept : RegisterEntryDescriptor<MarsType, MarsList> {
             if constexpr (marsApplicable<Stage, Sec, Variant>()) {
                 return &MarsOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/mars/marsEncoding.h b/src/metkit/mars2grib/backend/concepts/mars/marsEncoding.h
index 1815121b..2abce5e9 100644
--- a/src/metkit/mars2grib/backend/concepts/mars/marsEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/mars/marsEncoding.h
@@ -49,7 +49,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/mars/marsEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/class.h"
@@ -198,9 +197,6 @@ void MarsOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& opt,
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(mars, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/mars/marsEnum.h b/src/metkit/mars2grib/backend/concepts/mars/marsEnum.h
index 993290bd..c52d5386 100644
--- a/src/metkit/mars2grib/backend/concepts/mars/marsEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/mars/marsEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/mars/marsMatcher.h b/src/metkit/mars2grib/backend/concepts/mars/marsMatcher.h
index 9dcbbf28..41b28f44 100644
--- a/src/metkit/mars2grib/backend/concepts/mars/marsMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/mars/marsMatcher.h
@@ -6,7 +6,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/mars/marsEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/nil/nilConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/nil/nilConceptDescriptor.h
index c5085a92..884cba58 100644
--- a/src/metkit/mars2grib/backend/concepts/nil/nilConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/nil/nilConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/nil/nilEncoding.h"
@@ -123,15 +122,9 @@ struct NilConcept : RegisterEntryDescriptor<NilType, NilList> {
             if constexpr (nilApplicable<Stage, Sec, Variant>()) {
                 return &NilOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     ///
diff --git a/src/metkit/mars2grib/backend/concepts/nil/nilEncoding.h b/src/metkit/mars2grib/backend/concepts/nil/nilEncoding.h
index 547444b0..f9934b46 100644
--- a/src/metkit/mars2grib/backend/concepts/nil/nilEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/nil/nilEncoding.h
@@ -39,7 +39,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/nil/nilEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Utils
 #include "metkit/config/LibMetkit.h"
@@ -118,9 +117,6 @@ void NilOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& opt, O
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(nil, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/nil/nilEnum.h b/src/metkit/mars2grib/backend/concepts/nil/nilEnum.h
index de2ed95b..8afa497d 100644
--- a/src/metkit/mars2grib/backend/concepts/nil/nilEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/nil/nilEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/nil/nilMatcher.h b/src/metkit/mars2grib/backend/concepts/nil/nilMatcher.h
index bfd12acf..444f53b8 100644
--- a/src/metkit/mars2grib/backend/concepts/nil/nilMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/nil/nilMatcher.h
@@ -5,7 +5,6 @@
 
 // Utils
 #include "metkit/mars2grib/backend/concepts/nil/nilEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/origin/originConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/origin/originConceptDescriptor.h
index b03f44fc..9c69a29f 100644
--- a/src/metkit/mars2grib/backend/concepts/origin/originConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/origin/originConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/origin/originEncoding.h"
@@ -73,15 +72,9 @@ struct OriginConcept : RegisterEntryDescriptor<OriginType, OriginList> {
             if constexpr (originApplicable<Stage, Sec, Variant>()) {
                 return &OriginOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, OriginType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/origin/originEncoding.h b/src/metkit/mars2grib/backend/concepts/origin/originEncoding.h
index 745cead6..4226e09e 100644
--- a/src/metkit/mars2grib/backend/concepts/origin/originEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/origin/originEncoding.h
@@ -43,7 +43,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/origin/originEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/centre.h"
@@ -146,9 +145,6 @@ void OriginOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& opt
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(origin, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/origin/originEnum.h b/src/metkit/mars2grib/backend/concepts/origin/originEnum.h
index a672fee5..9189a342 100644
--- a/src/metkit/mars2grib/backend/concepts/origin/originEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/origin/originEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/origin/originMatcher.h b/src/metkit/mars2grib/backend/concepts/origin/originMatcher.h
index 7a200702..ae00a6bf 100644
--- a/src/metkit/mars2grib/backend/concepts/origin/originMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/origin/originMatcher.h
@@ -5,7 +5,6 @@
 
 // Utils
 #include "metkit/mars2grib/backend/concepts/origin/originEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/packing/packingConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/packing/packingConceptDescriptor.h
index d76c5083..29cc2d78 100644
--- a/src/metkit/mars2grib/backend/concepts/packing/packingConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/packing/packingConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/packing/packingEncoding.h"
@@ -73,15 +72,9 @@ struct PackingConcept : RegisterEntryDescriptor<PackingType, PackingList> {
             if constexpr (packingApplicable<Stage, Sec, Variant>()) {
                 return &PackingOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, PackingType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/packing/packingEncoding.h b/src/metkit/mars2grib/backend/concepts/packing/packingEncoding.h
index dc0466d6..50231e90 100644
--- a/src/metkit/mars2grib/backend/concepts/packing/packingEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/packing/packingEncoding.h
@@ -48,7 +48,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/packing/packingEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Checks
 #include "metkit/mars2grib/backend/checks/matchDataRepresentationTemplateNumber.h"
@@ -207,9 +206,6 @@ void PackingOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& op
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(packing, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/packing/packingEnum.h b/src/metkit/mars2grib/backend/concepts/packing/packingEnum.h
index 49d1b38b..114b8031 100644
--- a/src/metkit/mars2grib/backend/concepts/packing/packingEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/packing/packingEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/packing/packingMatcher.h b/src/metkit/mars2grib/backend/concepts/packing/packingMatcher.h
index b2b91f64..c082cb02 100644
--- a/src/metkit/mars2grib/backend/concepts/packing/packingMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/packing/packingMatcher.h
@@ -7,7 +7,6 @@
 // Project includes
 #include "metkit/mars2grib/backend/concepts/packing/packingEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/param/paramConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/param/paramConceptDescriptor.h
index 7950c79c..51f99a2b 100644
--- a/src/metkit/mars2grib/backend/concepts/param/paramConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/param/paramConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/param/paramEncoding.h"
@@ -73,15 +72,9 @@ struct ParamConcept : RegisterEntryDescriptor<ParamType, ParamList> {
             if constexpr (paramApplicable<Stage, Sec, Variant>()) {
                 return &ParamOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, ParamType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/param/paramEncoding.h b/src/metkit/mars2grib/backend/concepts/param/paramEncoding.h
index 81c0af84..e3510166 100644
--- a/src/metkit/mars2grib/backend/concepts/param/paramEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/param/paramEncoding.h
@@ -42,7 +42,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/param/paramEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/paramId.h"
@@ -150,9 +149,6 @@ void ParamOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& opt,
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(param, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/param/paramEnum.h b/src/metkit/mars2grib/backend/concepts/param/paramEnum.h
index 816ac5ee..3e17c0e8 100644
--- a/src/metkit/mars2grib/backend/concepts/param/paramEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/param/paramEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/param/paramMatcher.h b/src/metkit/mars2grib/backend/concepts/param/paramMatcher.h
index 06472991..270f3473 100644
--- a/src/metkit/mars2grib/backend/concepts/param/paramMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/param/paramMatcher.h
@@ -5,7 +5,6 @@
 
 // Utils
 #include "metkit/mars2grib/backend/concepts/param/paramEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeConceptDescriptor.h
index 90d645a0..e1749550 100644
--- a/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEncoding.h"
@@ -73,15 +72,9 @@ struct PointInTimeConcept : RegisterEntryDescriptor<PointInTimeType, PointInTime
             if constexpr (pointInTimeApplicable<Stage, Sec, Variant>()) {
                 return &PointInTimeOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, PointInTimeType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEncoding.h b/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEncoding.h
index 41911e1a..1e7115a1 100644
--- a/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEncoding.h
@@ -47,7 +47,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Tables
 #include "metkit/mars2grib/backend/tables/timeUnits.h"
@@ -197,9 +196,6 @@ void PointInTimeOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(pointInTime, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEnum.h b/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEnum.h
index 1a209a05..33c9f0c5 100644
--- a/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeMatcher.h b/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeMatcher.h
index e16455ed..ca36d14f 100644
--- a/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/point-in-time/pointInTimeMatcher.h
@@ -6,7 +6,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/point-in-time/pointInTimeEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/paramMatcher.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeConceptDescriptor.h
index ad6d5777..9de75bf3 100644
--- a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h"
@@ -73,15 +72,9 @@ struct ReferenceTimeConcept : RegisterEntryDescriptor<ReferenceTimeType, Referen
             if constexpr (referenceTimeApplicable<Stage, Sec, Variant>()) {
                 return &ReferenceTimeOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, ReferenceTimeType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h
index bce5ba7d..d2474bda 100644
--- a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEncoding.h
@@ -59,7 +59,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/reference-time/referenceTimeEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/hindcastDateTime.h"
@@ -248,9 +247,6 @@ void ReferenceTimeOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(referenceTime, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEnum.h b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEnum.h
index 8be8a783..f919f4db 100644
--- a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeMatcher.h b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeMatcher.h
index 65da076b..ab9bb867 100644
--- a/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/reference-time/referenceTimeMatcher.h
@@ -6,7 +6,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/reference-time/referenceTimeEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/representation/representationConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/representation/representationConceptDescriptor.h
index e0597b8d..7870a62d 100644
--- a/src/metkit/mars2grib/backend/concepts/representation/representationConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/representation/representationConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/representation/representationEncoding.h"
@@ -73,15 +72,9 @@ struct RepresentationConcept : RegisterEntryDescriptor<RepresentationType, Repre
             if constexpr (representationApplicable<Stage, Sec, Variant>()) {
                 return &RepresentationOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, RepresentationType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/representation/representationEncoding.h b/src/metkit/mars2grib/backend/concepts/representation/representationEncoding.h
index 400261c2..170637dd 100644
--- a/src/metkit/mars2grib/backend/concepts/representation/representationEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/representation/representationEncoding.h
@@ -132,7 +132,6 @@
 #include "eckit/geo/grid/regular/RegularGaussian.h"
 #include "eckit/geo/grid/regular/RegularLL.h"
 #include "eckit/spec/Custom.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 // Core concept includes
@@ -466,9 +465,6 @@ void RepresentationOp(const MarsDict_t& mars, const ParDict_t& par, const OptDic
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(representation, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/representation/representationEnum.h b/src/metkit/mars2grib/backend/concepts/representation/representationEnum.h
index b4f031e1..8cc06d84 100644
--- a/src/metkit/mars2grib/backend/concepts/representation/representationEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/representation/representationEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/representation/representationMatcher.h b/src/metkit/mars2grib/backend/concepts/representation/representationMatcher.h
index 08cabf17..ba099cbe 100644
--- a/src/metkit/mars2grib/backend/concepts/representation/representationMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/representation/representationMatcher.h
@@ -8,7 +8,6 @@
 #include "eckit/spec/Custom.h"
 #include "metkit/mars2grib/backend/concepts/representation/representationEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/satellite/satelliteConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/satellite/satelliteConceptDescriptor.h
index ed43bc27..f2d2eb74 100644
--- a/src/metkit/mars2grib/backend/concepts/satellite/satelliteConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/satellite/satelliteConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/satellite/satelliteEncoding.h"
@@ -73,15 +72,9 @@ struct SatelliteConcept : RegisterEntryDescriptor<SatelliteType, SatelliteList>
             if constexpr (satelliteApplicable<Stage, Sec, Variant>()) {
                 return &SatelliteOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, SatelliteType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/satellite/satelliteEncoding.h b/src/metkit/mars2grib/backend/concepts/satellite/satelliteEncoding.h
index 2ac3f05c..1074c56d 100644
--- a/src/metkit/mars2grib/backend/concepts/satellite/satelliteEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/satellite/satelliteEncoding.h
@@ -108,7 +108,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/satellite/satelliteEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Checks
 #include "metkit/mars2grib/backend/checks/matchLocalDefinitionNumber.h"
@@ -266,9 +265,6 @@ void SatelliteOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t&
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(satellite, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/satellite/satelliteEnum.h b/src/metkit/mars2grib/backend/concepts/satellite/satelliteEnum.h
index 2f52d1f0..e7a9674e 100644
--- a/src/metkit/mars2grib/backend/concepts/satellite/satelliteEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/satellite/satelliteEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/satellite/satelliteMatcher.h b/src/metkit/mars2grib/backend/concepts/satellite/satelliteMatcher.h
index 07dfba36..3e715b8e 100644
--- a/src/metkit/mars2grib/backend/concepts/satellite/satelliteMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/satellite/satelliteMatcher.h
@@ -6,7 +6,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/satellite/satelliteEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthConceptDescriptor.h
index 65a82d5c..066aa2a7 100644
--- a/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEncoding.h"
@@ -73,15 +72,9 @@ struct ShapeOfTheEarthConcept : RegisterEntryDescriptor<ShapeOfTheEarthType, Sha
             if constexpr (shapeOfTheEarthApplicable<Stage, Sec, Variant>()) {
                 return &ShapeOfTheEarthOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, ShapeOfTheEarthType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEncoding.h b/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEncoding.h
index aeb43fc0..585802e1 100644
--- a/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEncoding.h
@@ -43,7 +43,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/shapeOfTheEarth.h"
@@ -153,9 +152,6 @@ void ShapeOfTheEarthOp(const MarsDict_t& mars, const ParDict_t& par, const OptDi
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(shapeOfTheEarth, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEnum.h b/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEnum.h
index af23d1ee..33efb1f7 100644
--- a/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthMatcher.h b/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthMatcher.h
index 0134b485..1dabde57 100644
--- a/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthMatcher.h
@@ -7,7 +7,6 @@
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/shape-of-the-earth/shapeOfTheEarthEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/statistics/statisticsConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/statistics/statisticsConceptDescriptor.h
index 0d107aa2..f89beb49 100644
--- a/src/metkit/mars2grib/backend/concepts/statistics/statisticsConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/statistics/statisticsConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/statistics/statisticsEncoding.h"
@@ -73,15 +72,9 @@ struct StatisticsConcept : RegisterEntryDescriptor<StatisticsType, StatisticsLis
             if constexpr (statisticsApplicable<Stage, Sec, Variant>()) {
                 return &StatisticsOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, StatisticsType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/statistics/statisticsEncoding.h b/src/metkit/mars2grib/backend/concepts/statistics/statisticsEncoding.h
index 69ba80c4..5aa3cda2 100644
--- a/src/metkit/mars2grib/backend/concepts/statistics/statisticsEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/statistics/statisticsEncoding.h
@@ -53,7 +53,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/statistics/statisticsEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/forecastTimeInSeconds.h"
@@ -272,9 +271,6 @@ void StatisticsOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t&
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(statistics, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/statistics/statisticsEnum.h b/src/metkit/mars2grib/backend/concepts/statistics/statisticsEnum.h
index c5cbcb2a..11acb60c 100644
--- a/src/metkit/mars2grib/backend/concepts/statistics/statisticsEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/statistics/statisticsEnum.h
@@ -45,7 +45,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/statistics/statisticsMatcher.h b/src/metkit/mars2grib/backend/concepts/statistics/statisticsMatcher.h
index dee0a18d..f1c31bab 100644
--- a/src/metkit/mars2grib/backend/concepts/statistics/statisticsMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/statistics/statisticsMatcher.h
@@ -7,7 +7,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/statistics/statisticsEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 #include "metkit/mars2grib/utils/paramMatcher.h"
 
diff --git a/src/metkit/mars2grib/backend/concepts/tables/tablesConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/tables/tablesConceptDescriptor.h
index 5c7e78df..26e26b5f 100644
--- a/src/metkit/mars2grib/backend/concepts/tables/tablesConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/tables/tablesConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/tables/tablesEncoding.h"
@@ -73,15 +72,9 @@ struct TablesConcept : RegisterEntryDescriptor<TablesType, TablesList> {
             if constexpr (tablesApplicable<Stage, Sec, Variant>()) {
                 return &TablesOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, TablesType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/tables/tablesEncoding.h b/src/metkit/mars2grib/backend/concepts/tables/tablesEncoding.h
index 7ee0e004..645cfc70 100644
--- a/src/metkit/mars2grib/backend/concepts/tables/tablesEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/tables/tablesEncoding.h
@@ -48,7 +48,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/tables/tablesEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/localTablesVersion.h"
@@ -199,9 +198,6 @@ void TablesOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& opt
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(tables, "Concept called when not applicable...");
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/tables/tablesEnum.h b/src/metkit/mars2grib/backend/concepts/tables/tablesEnum.h
index 3ab97b11..2802b5d6 100644
--- a/src/metkit/mars2grib/backend/concepts/tables/tablesEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/tables/tablesEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/tables/tablesMatcher.h b/src/metkit/mars2grib/backend/concepts/tables/tablesMatcher.h
index c3c0aca6..ccb3fbb8 100644
--- a/src/metkit/mars2grib/backend/concepts/tables/tablesMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/tables/tablesMatcher.h
@@ -6,7 +6,6 @@
 // Utils
 #include "metkit/mars2grib/backend/concepts/tables/tablesEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/paramMatcher.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/concepts/wave/waveConceptDescriptor.h b/src/metkit/mars2grib/backend/concepts/wave/waveConceptDescriptor.h
index 2b248458..cb3efdcb 100644
--- a/src/metkit/mars2grib/backend/concepts/wave/waveConceptDescriptor.h
+++ b/src/metkit/mars2grib/backend/concepts/wave/waveConceptDescriptor.h
@@ -35,7 +35,6 @@
 // Registry engine
 #include "metkit/mars2grib/backend/compile-time-registry-engine/RegisterEntryDescriptor.h"
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core concept includes
 #include "metkit/mars2grib/backend/concepts/wave/waveEncoding.h"
@@ -73,15 +72,9 @@ struct WaveConcept : RegisterEntryDescriptor<WaveType, WaveList> {
             if constexpr (waveApplicable<Stage, Sec, Variant>()) {
                 return &WaveOp<Stage, Sec, Variant, MarsDict_t, ParDict_t, OptDict_t, OutDict_t>;
             }
-            else {
-                return nullptr;
-            }
-        }
-        else {
-            return nullptr;
         }
 
-        mars2gribUnreachable();
+        return nullptr;
     }
 
     template <std::size_t Capability, WaveType Variant, class MarsDict_t, class ParDict_t, class OptDict_t,
diff --git a/src/metkit/mars2grib/backend/concepts/wave/waveEncoding.h b/src/metkit/mars2grib/backend/concepts/wave/waveEncoding.h
index 4a5cb3f2..093790ec 100644
--- a/src/metkit/mars2grib/backend/concepts/wave/waveEncoding.h
+++ b/src/metkit/mars2grib/backend/concepts/wave/waveEncoding.h
@@ -50,7 +50,6 @@
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
 #include "metkit/mars2grib/backend/concepts/wave/waveEnum.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/periodItMax.h"
@@ -296,10 +295,6 @@ void WaveOp(const MarsDict_t& mars, const ParDict_t& par, const OptDict_t& opt,
 
     // Concept invoked outside its applicability domain
     MARS2GRIB_CONCEPT_THROW(wave, "Concept called when not applicable...");
-
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::concepts_
diff --git a/src/metkit/mars2grib/backend/concepts/wave/waveEnum.h b/src/metkit/mars2grib/backend/concepts/wave/waveEnum.h
index b6a6331a..331b98e7 100644
--- a/src/metkit/mars2grib/backend/concepts/wave/waveEnum.h
+++ b/src/metkit/mars2grib/backend/concepts/wave/waveEnum.h
@@ -43,7 +43,6 @@
 
 // Core concept includes
 #include "metkit/mars2grib/backend/compile-time-registry-engine/common.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
 
diff --git a/src/metkit/mars2grib/backend/concepts/wave/waveMatcher.h b/src/metkit/mars2grib/backend/concepts/wave/waveMatcher.h
index 9150d20d..b8dbc505 100644
--- a/src/metkit/mars2grib/backend/concepts/wave/waveMatcher.h
+++ b/src/metkit/mars2grib/backend/concepts/wave/waveMatcher.h
@@ -7,7 +7,6 @@
 #include "eckit/exception/Exceptions.h"
 #include "metkit/mars2grib/backend/concepts/wave/waveEnum.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/paramMatcher.h"
 
 namespace metkit::mars2grib::backend::concepts_ {
diff --git a/src/metkit/mars2grib/backend/deductions/activity.h b/src/metkit/mars2grib/backend/deductions/activity.h
index cb4ec173..8d4ec587 100644
--- a/src/metkit/mars2grib/backend/deductions/activity.h
+++ b/src/metkit/mars2grib/backend/deductions/activity.h
@@ -54,7 +54,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -133,9 +132,6 @@ std::string resolve_Activity_or_throw(const MarsDict_t& mars, [[maybe_unused]] c
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `activity` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/allowedReferenceValue.h b/src/metkit/mars2grib/backend/deductions/allowedReferenceValue.h
index 3d283127..08827b35 100644
--- a/src/metkit/mars2grib/backend/deductions/allowedReferenceValue.h
+++ b/src/metkit/mars2grib/backend/deductions/allowedReferenceValue.h
@@ -58,7 +58,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -219,9 +218,6 @@ double resolve_AllowedReferenceValue_or_throw(const MarsDict_t& mars, const ParD
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `allowedReferenceValue` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/backgroundProcess.h b/src/metkit/mars2grib/backend/deductions/backgroundProcess.h
index d9beb985..4b8499f4 100644
--- a/src/metkit/mars2grib/backend/deductions/backgroundProcess.h
+++ b/src/metkit/mars2grib/backend/deductions/backgroundProcess.h
@@ -55,7 +55,6 @@
 
 // Tables
 #include "metkit/mars2grib/backend/tables/backgroundProcess.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
@@ -173,9 +172,6 @@ tables::BackgroundProcess resolve_BackgroundProcess_or_throw(const MarsDict_t& m
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `backgroundProcess` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/bitsPerValue.h b/src/metkit/mars2grib/backend/deductions/bitsPerValue.h
index 80774f4c..a0d23bd8 100644
--- a/src/metkit/mars2grib/backend/deductions/bitsPerValue.h
+++ b/src/metkit/mars2grib/backend/deductions/bitsPerValue.h
@@ -64,7 +64,6 @@
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -296,9 +295,6 @@ long resolve_BitsPerValueGridded_or_throw(const MarsDict_t& mars, const ParDict_
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `bitsPerValue` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
@@ -401,9 +397,6 @@ long resolve_BitsPerValueSpectral_or_throw(const MarsDict_t& mars, const ParDict
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `bitsPerValue` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
diff --git a/src/metkit/mars2grib/backend/deductions/centre.h b/src/metkit/mars2grib/backend/deductions/centre.h
index 156a18a9..a16c2ef9 100644
--- a/src/metkit/mars2grib/backend/deductions/centre.h
+++ b/src/metkit/mars2grib/backend/deductions/centre.h
@@ -54,7 +54,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
diff --git a/src/metkit/mars2grib/backend/deductions/channel.h b/src/metkit/mars2grib/backend/deductions/channel.h
index d15edfea..bb78cf6b 100644
--- a/src/metkit/mars2grib/backend/deductions/channel.h
+++ b/src/metkit/mars2grib/backend/deductions/channel.h
@@ -56,7 +56,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -136,9 +135,6 @@ long resolve_Channel_or_throw(const MarsDict_t& mars, const ParDict_t& par, cons
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `channel` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/class.h b/src/metkit/mars2grib/backend/deductions/class.h
index d6de9514..e45a78fe 100644
--- a/src/metkit/mars2grib/backend/deductions/class.h
+++ b/src/metkit/mars2grib/backend/deductions/class.h
@@ -56,7 +56,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -135,9 +134,6 @@ std::string resolve_Class_or_throw(const MarsDict_t& mars, const ParDict_t& par,
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `class` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/constituentType.h b/src/metkit/mars2grib/backend/deductions/constituentType.h
index 5d49b5f5..b7dcbd29 100644
--- a/src/metkit/mars2grib/backend/deductions/constituentType.h
+++ b/src/metkit/mars2grib/backend/deductions/constituentType.h
@@ -55,7 +55,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -147,9 +146,6 @@ long resolve_ConstituentType_or_throw(const MarsDict_t& mars, const ParDict_t& p
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `constituentType` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/dataset.h b/src/metkit/mars2grib/backend/deductions/dataset.h
index f5492b61..7f8c0616 100644
--- a/src/metkit/mars2grib/backend/deductions/dataset.h
+++ b/src/metkit/mars2grib/backend/deductions/dataset.h
@@ -59,7 +59,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -138,9 +137,6 @@ std::string resolve_Dataset_or_throw(const MarsDict_t& mars, const ParDict_t& pa
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `dataset` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/derivedForecast.h b/src/metkit/mars2grib/backend/deductions/derivedForecast.h
index 98e474f0..7aef897a 100644
--- a/src/metkit/mars2grib/backend/deductions/derivedForecast.h
+++ b/src/metkit/mars2grib/backend/deductions/derivedForecast.h
@@ -53,7 +53,6 @@
 
 // Tables
 #include "metkit/mars2grib/backend/tables/derivedForecast.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
@@ -172,9 +171,6 @@ tables::DerivedForecast resolve_DerivedForecast_or_throw(const MarsDict_t& mars,
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `derivedForecast` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
diff --git a/src/metkit/mars2grib/backend/deductions/detail/pv_137_be.h b/src/metkit/mars2grib/backend/deductions/detail/pv_137_be.h
index fd7e15e8..cb797059 100644
--- a/src/metkit/mars2grib/backend/deductions/detail/pv_137_be.h
+++ b/src/metkit/mars2grib/backend/deductions/detail/pv_137_be.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // namespace metkit::mars2grib::backend::deductions::pv_detail::data {
 
diff --git a/src/metkit/mars2grib/backend/deductions/detail/timeUtils.h b/src/metkit/mars2grib/backend/deductions/detail/timeUtils.h
index 306b7c4d..6adfd4cf 100644
--- a/src/metkit/mars2grib/backend/deductions/detail/timeUtils.h
+++ b/src/metkit/mars2grib/backend/deductions/detail/timeUtils.h
@@ -8,7 +8,6 @@
 
 #include <eckit/types/DateTime.h>
 #include "eckit/exception/Exceptions.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::deductions::detail {
 
diff --git a/src/metkit/mars2grib/backend/deductions/experiment.h b/src/metkit/mars2grib/backend/deductions/experiment.h
index 279386a7..0b2e32c9 100644
--- a/src/metkit/mars2grib/backend/deductions/experiment.h
+++ b/src/metkit/mars2grib/backend/deductions/experiment.h
@@ -59,7 +59,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -138,9 +137,6 @@ std::string resolve_Experiment_or_throw(const MarsDict_t& mars, const ParDict_t&
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `experiment` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/expver.h b/src/metkit/mars2grib/backend/deductions/expver.h
index f4a1853a..c4613b9c 100644
--- a/src/metkit/mars2grib/backend/deductions/expver.h
+++ b/src/metkit/mars2grib/backend/deductions/expver.h
@@ -57,7 +57,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -136,9 +135,6 @@ std::string resolve_Expver_or_throw(const MarsDict_t& mars, const ParDict_t& par
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `expver` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/forecastTimeInSeconds.h b/src/metkit/mars2grib/backend/deductions/forecastTimeInSeconds.h
index bbf0e396..0496eed2 100644
--- a/src/metkit/mars2grib/backend/deductions/forecastTimeInSeconds.h
+++ b/src/metkit/mars2grib/backend/deductions/forecastTimeInSeconds.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/logUtils.h"
@@ -107,9 +106,6 @@ long resolve_ForecastTimeInSeconds_or_throw(const MarsDict_t& mars, const ParDic
         // Rethrow nested exceptions
         std::throw_with_nested(Mars2GribDeductionException("Unable to compute forecast time", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/generatingProcessIdentifier.h b/src/metkit/mars2grib/backend/deductions/generatingProcessIdentifier.h
index aeebbb53..9cf15f53 100644
--- a/src/metkit/mars2grib/backend/deductions/generatingProcessIdentifier.h
+++ b/src/metkit/mars2grib/backend/deductions/generatingProcessIdentifier.h
@@ -14,7 +14,6 @@
 
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
@@ -122,9 +121,6 @@ std::optional<long> resolve_GeneratingProcessIdentifier_opt([[maybe_unused]] con
         std::throw_with_nested(Mars2GribDeductionException(
             "Unable to get `generatingProcessIdentifier` from parameter dictionary", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/generation.h b/src/metkit/mars2grib/backend/deductions/generation.h
index 252e96cb..87bc1acc 100644
--- a/src/metkit/mars2grib/backend/deductions/generation.h
+++ b/src/metkit/mars2grib/backend/deductions/generation.h
@@ -59,7 +59,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -138,9 +137,6 @@ long resolve_Generation_or_throw(const MarsDict_t& mars, const ParDict_t& par, c
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `generation` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/hindcastDateTime.h b/src/metkit/mars2grib/backend/deductions/hindcastDateTime.h
index f5b74775..0b6d3fb9 100644
--- a/src/metkit/mars2grib/backend/deductions/hindcastDateTime.h
+++ b/src/metkit/mars2grib/backend/deductions/hindcastDateTime.h
@@ -15,7 +15,6 @@
 #include "eckit/types/Date.h"
 #include "eckit/types/DateTime.h"
 #include "eckit/types/Time.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/mars2grib/backend/deductions/detail/timeUtils.h"
 
@@ -122,9 +121,6 @@ eckit::DateTime resolve_HindcastDateTime_or_throw(const MarsDict_t& mars, const
         std::throw_with_nested(Mars2GribDeductionException(
             "Unable to get `date` and `time` from Mars dictionary to deduce `dateTime`", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/instrumentType.h b/src/metkit/mars2grib/backend/deductions/instrumentType.h
index 8cdc0b17..68df5c66 100644
--- a/src/metkit/mars2grib/backend/deductions/instrumentType.h
+++ b/src/metkit/mars2grib/backend/deductions/instrumentType.h
@@ -58,7 +58,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -138,9 +137,6 @@ long resolve_InstrumentType_or_throw(const MarsDict_t& mars, const ParDict_t& pa
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `instrumentType` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/laplacianOperator.h b/src/metkit/mars2grib/backend/deductions/laplacianOperator.h
index 0a098e22..47060407 100644
--- a/src/metkit/mars2grib/backend/deductions/laplacianOperator.h
+++ b/src/metkit/mars2grib/backend/deductions/laplacianOperator.h
@@ -56,7 +56,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -134,9 +133,6 @@ double resolve_LaplacianOperator_or_throw(const MarsDict_t& mars, const ParDict_
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `laplacianOperator` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/lengthOfTimeWindow.h b/src/metkit/mars2grib/backend/deductions/lengthOfTimeWindow.h
index d329140e..d9345aa5 100644
--- a/src/metkit/mars2grib/backend/deductions/lengthOfTimeWindow.h
+++ b/src/metkit/mars2grib/backend/deductions/lengthOfTimeWindow.h
@@ -59,7 +59,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -163,9 +162,6 @@ std::optional<long> resolve_LengthOfTimeWindowInSeconds_or_throw(const MarsDict_
         std::throw_with_nested(
             Mars2GribDeductionException("Unable to get `lengthOfTimeWindow` from Par dictionary", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/level.h b/src/metkit/mars2grib/backend/deductions/level.h
index 16538af6..f2f5451b 100644
--- a/src/metkit/mars2grib/backend/deductions/level.h
+++ b/src/metkit/mars2grib/backend/deductions/level.h
@@ -59,7 +59,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -139,9 +138,6 @@ long resolve_Level_or_throw(const MarsDict_t& mars, const ParDict_t& par, const
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `levelist` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/localTablesVersion.h b/src/metkit/mars2grib/backend/deductions/localTablesVersion.h
index d35aa3e8..c6e1fcd5 100644
--- a/src/metkit/mars2grib/backend/deductions/localTablesVersion.h
+++ b/src/metkit/mars2grib/backend/deductions/localTablesVersion.h
@@ -54,7 +54,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
diff --git a/src/metkit/mars2grib/backend/deductions/methodNumber.h b/src/metkit/mars2grib/backend/deductions/methodNumber.h
index 06a688f7..8428a8fa 100644
--- a/src/metkit/mars2grib/backend/deductions/methodNumber.h
+++ b/src/metkit/mars2grib/backend/deductions/methodNumber.h
@@ -53,7 +53,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/logUtils.h"
@@ -134,9 +133,6 @@ long resolve_MethodNumber_or_throw(const MarsDict_t& mars, const ParDict_t& par,
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `method` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/model.h b/src/metkit/mars2grib/backend/deductions/model.h
index d08a0121..7975223b 100644
--- a/src/metkit/mars2grib/backend/deductions/model.h
+++ b/src/metkit/mars2grib/backend/deductions/model.h
@@ -55,7 +55,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -130,9 +129,6 @@ std::string resolve_Model_or_throw(const MarsDict_t& mars, const ParDict_t& par,
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `model` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/numberOfForecastsInEnsemble.h b/src/metkit/mars2grib/backend/deductions/numberOfForecastsInEnsemble.h
index 4551d124..ea42c68a 100644
--- a/src/metkit/mars2grib/backend/deductions/numberOfForecastsInEnsemble.h
+++ b/src/metkit/mars2grib/backend/deductions/numberOfForecastsInEnsemble.h
@@ -44,7 +44,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/logUtils.h"
@@ -156,9 +155,6 @@ long resolve_NumberOfForecastsInEnsemble_or_throw(const MarsDict_t& mars, const
         std::throw_with_nested(Mars2GribDeductionException(
             "Failed to resolve `numberOfForecastsInEnsemble` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
diff --git a/src/metkit/mars2grib/backend/deductions/numberOfTimeRanges.h b/src/metkit/mars2grib/backend/deductions/numberOfTimeRanges.h
index 0d0b38c7..486bfb01 100644
--- a/src/metkit/mars2grib/backend/deductions/numberOfTimeRanges.h
+++ b/src/metkit/mars2grib/backend/deductions/numberOfTimeRanges.h
@@ -49,7 +49,6 @@
 
 // Details
 #include "metkit/mars2grib/backend/deductions/detail/timeUtils.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
@@ -136,30 +135,24 @@ long numberOfTimeRanges(const MarsDict_t& mars, const ParDict_t& par) {
             return numberOfTimeRanges;
         }
 
-        if (hasStatType) {
+        // Retrieve MARS stattype
+        std::string statTypeVal = get_or_throw<std::string>(mars, "stattype");
 
-            // Retrieve MARS stattype
-            std::string statTypeVal = get_or_throw<std::string>(mars, "stattype");
+        // Count number of blocks in stattype
+        long numberOfBlocks = static_cast<long>(countBlocks(statTypeVal));
 
-            // Count number of blocks in stattype
-            long numberOfBlocks = static_cast<long>(countBlocks(statTypeVal));
+        // Compute number of time ranges
+        long numberOfTimeRanges = numberOfBlocks + 1;
 
-            // Compute number of time ranges
-            long numberOfTimeRanges = numberOfBlocks + 1;
+        // Emit RESOLVE log entry
+        MARS2GRIB_LOG_RESOLVE([&]() {
+            std::string logMsg = "`numberOfTimeRanges` resolved from input dictionaries: value='";
+            logMsg += std::to_string(numberOfTimeRanges) + "'";
+            return logMsg;
+        }());
 
-            // Emit RESOLVE log entry
-            MARS2GRIB_LOG_RESOLVE([&]() {
-                std::string logMsg = "`numberOfTimeRanges` resolved from input dictionaries: value='";
-                logMsg += std::to_string(numberOfTimeRanges) + "'";
-                return logMsg;
-            }());
-
-            // Number of time ranges = number of blocks + 1
-            return numberOfTimeRanges;
-        }
-
-        // Remove compiler warning
-        mars2gribUnreachable();
+        // Number of time ranges = number of blocks + 1
+        return numberOfTimeRanges;
     }
     catch (...) {
 
@@ -167,9 +160,6 @@ long numberOfTimeRanges(const MarsDict_t& mars, const ParDict_t& par) {
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `numberOfTimeRanges` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/offsetToEndOf4DvarWindow.h b/src/metkit/mars2grib/backend/deductions/offsetToEndOf4DvarWindow.h
index 59d10fea..da9adb89 100644
--- a/src/metkit/mars2grib/backend/deductions/offsetToEndOf4DvarWindow.h
+++ b/src/metkit/mars2grib/backend/deductions/offsetToEndOf4DvarWindow.h
@@ -44,7 +44,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -122,9 +121,6 @@ long resolve_offsetToEndOf4DvarWindow_or_throw(const MarsDict_t& mars, const Par
         std::throw_with_nested(Mars2GribDeductionException(
             "Failed to resolve `offsetToEndOf4DvarWindow` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/paramId.h b/src/metkit/mars2grib/backend/deductions/paramId.h
index ee8ce134..0fe07e09 100644
--- a/src/metkit/mars2grib/backend/deductions/paramId.h
+++ b/src/metkit/mars2grib/backend/deductions/paramId.h
@@ -46,7 +46,6 @@
 
 // exception and logging
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
diff --git a/src/metkit/mars2grib/backend/deductions/periodItMax.h b/src/metkit/mars2grib/backend/deductions/periodItMax.h
index 5e592998..c4199604 100644
--- a/src/metkit/mars2grib/backend/deductions/periodItMax.h
+++ b/src/metkit/mars2grib/backend/deductions/periodItMax.h
@@ -52,7 +52,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -142,9 +141,6 @@ std::optional<long> resolve_PeriodItMax_opt(const MarsDict_t& mars, const ParDic
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `iTmax` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/periodItMin.h b/src/metkit/mars2grib/backend/deductions/periodItMin.h
index b6cb6239..44885ec2 100644
--- a/src/metkit/mars2grib/backend/deductions/periodItMin.h
+++ b/src/metkit/mars2grib/backend/deductions/periodItMin.h
@@ -52,7 +52,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -140,9 +139,6 @@ std::optional<long> resolve_PeriodItMin_opt(const MarsDict_t& mars, const ParDic
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `iTmin` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/perturbationNumber.h b/src/metkit/mars2grib/backend/deductions/perturbationNumber.h
index c0206626..8e82a217 100644
--- a/src/metkit/mars2grib/backend/deductions/perturbationNumber.h
+++ b/src/metkit/mars2grib/backend/deductions/perturbationNumber.h
@@ -67,7 +67,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -145,9 +144,6 @@ long resolve_PerturbationNumber_or_throw(const MarsDict_t& mars, const ParDict_t
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `number` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/productionStatusOfProcessedData.h b/src/metkit/mars2grib/backend/deductions/productionStatusOfProcessedData.h
index caefe2e4..72bedf38 100644
--- a/src/metkit/mars2grib/backend/deductions/productionStatusOfProcessedData.h
+++ b/src/metkit/mars2grib/backend/deductions/productionStatusOfProcessedData.h
@@ -49,7 +49,6 @@
 
 // Table includes
 #include "metkit/mars2grib/backend/tables/productionStatusOfProcessedData.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
@@ -167,9 +166,6 @@ tables::ProductionStatusOfProcessedData resolve_ProductionStatusOfProcessedData_
         std::throw_with_nested(Mars2GribDeductionException(
             "Failed to resolve `productionStatusOfProcessedData` from input dictionaries", Here()));
     }
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
diff --git a/src/metkit/mars2grib/backend/deductions/pvArray.h b/src/metkit/mars2grib/backend/deductions/pvArray.h
index e1573e37..40d93aac 100644
--- a/src/metkit/mars2grib/backend/deductions/pvArray.h
+++ b/src/metkit/mars2grib/backend/deductions/pvArray.h
@@ -76,7 +76,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -280,9 +279,6 @@ inline bool hostIsLittleEndian_or_throw() {
         return true;  // host LE
 
     throw Mars2GribDeductionException("Unsupported floating-point representation (non IEEE754 double?)", Here());
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 ///
@@ -399,9 +395,6 @@ std::vector<double> lookup_PvArrayFromSize_or_throw(long pvArraySize) {
     catch (...) {
         std::throw_with_nested(Mars2GribDeductionException("Unable to lookup PV array from size", Here()));
     }
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 ///
@@ -650,9 +643,6 @@ std::vector<double> resolve_PvArray_or_throw(const MarsDict_t& mars, const ParDi
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `pvArray` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/realization.h b/src/metkit/mars2grib/backend/deductions/realization.h
index 0c433c34..c43f5393 100644
--- a/src/metkit/mars2grib/backend/deductions/realization.h
+++ b/src/metkit/mars2grib/backend/deductions/realization.h
@@ -58,7 +58,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -143,9 +142,6 @@ long resolve_Realization_or_throw(const MarsDict_t& mars, const ParDict_t& par,
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `realization` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/referenceDateTime.h b/src/metkit/mars2grib/backend/deductions/referenceDateTime.h
index 4069b164..729172ad 100644
--- a/src/metkit/mars2grib/backend/deductions/referenceDateTime.h
+++ b/src/metkit/mars2grib/backend/deductions/referenceDateTime.h
@@ -15,7 +15,6 @@
 #include "eckit/types/Date.h"
 #include "eckit/types/DateTime.h"
 #include "eckit/types/Time.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/mars2grib/backend/deductions/detail/timeUtils.h"
 
@@ -113,9 +112,6 @@ eckit::DateTime resolve_ReferenceDateTime_or_throw(const MarsDict_t& mars, const
         std::throw_with_nested(Mars2GribDeductionException(
             "Unable to get `date` and `time` from Mars dictionary to deduce `dateTime`", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/resolution.h b/src/metkit/mars2grib/backend/deductions/resolution.h
index 7c50cdbe..c49e3164 100644
--- a/src/metkit/mars2grib/backend/deductions/resolution.h
+++ b/src/metkit/mars2grib/backend/deductions/resolution.h
@@ -54,7 +54,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -132,9 +131,6 @@ std::string resolve_Resolution_or_throw(const MarsDict_t& mars, const ParDict_t&
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `resolution` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/satelliteNumber.h b/src/metkit/mars2grib/backend/deductions/satelliteNumber.h
index 29bef79a..3ea170d2 100644
--- a/src/metkit/mars2grib/backend/deductions/satelliteNumber.h
+++ b/src/metkit/mars2grib/backend/deductions/satelliteNumber.h
@@ -52,7 +52,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -130,9 +129,6 @@ long resolve_satelliteNumber_or_throw(const MarsDict_t& mars, const ParDict_t& p
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `satelliteNumber` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/satelliteSeries.h b/src/metkit/mars2grib/backend/deductions/satelliteSeries.h
index b1411dfe..fed82e10 100644
--- a/src/metkit/mars2grib/backend/deductions/satelliteSeries.h
+++ b/src/metkit/mars2grib/backend/deductions/satelliteSeries.h
@@ -52,7 +52,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -129,9 +128,6 @@ long resolve_SatelliteSeries_or_throw(const MarsDict_t& mars, const ParDict_t& p
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `satelliteSeries` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/scaleFactorOfCentralWaveNumber.h b/src/metkit/mars2grib/backend/deductions/scaleFactorOfCentralWaveNumber.h
index 43b8553a..649f8c4f 100644
--- a/src/metkit/mars2grib/backend/deductions/scaleFactorOfCentralWaveNumber.h
+++ b/src/metkit/mars2grib/backend/deductions/scaleFactorOfCentralWaveNumber.h
@@ -46,7 +46,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -126,9 +125,6 @@ long resolve_ScaleFactorOfCentralWaveNumber_or_throw(const MarsDict_t& mars, con
         std::throw_with_nested(Mars2GribDeductionException(
             "Failed to resolve `scaleFactorOfCentralWaveNumber` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/scaledValueOfCentralWaveNumber.h b/src/metkit/mars2grib/backend/deductions/scaledValueOfCentralWaveNumber.h
index a00a9fac..ef82fd10 100644
--- a/src/metkit/mars2grib/backend/deductions/scaledValueOfCentralWaveNumber.h
+++ b/src/metkit/mars2grib/backend/deductions/scaledValueOfCentralWaveNumber.h
@@ -47,7 +47,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -127,9 +126,6 @@ long resolve_ScaledValueOfCentralWaveNumber_or_throw(const MarsDict_t& mars, con
         std::throw_with_nested(Mars2GribDeductionException(
             "Failed to resolve `scaledValueOfCentralWaveNumber` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/shapeOfTheEarth.h b/src/metkit/mars2grib/backend/deductions/shapeOfTheEarth.h
index d8638bb9..58c7485e 100644
--- a/src/metkit/mars2grib/backend/deductions/shapeOfTheEarth.h
+++ b/src/metkit/mars2grib/backend/deductions/shapeOfTheEarth.h
@@ -51,7 +51,6 @@
 
 // Tables
 #include "metkit/mars2grib/backend/tables/shapeOfTheReferenceSystem.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
diff --git a/src/metkit/mars2grib/backend/deductions/significanceOfReferenceTime.h b/src/metkit/mars2grib/backend/deductions/significanceOfReferenceTime.h
index ecbf50c2..4c4320b3 100644
--- a/src/metkit/mars2grib/backend/deductions/significanceOfReferenceTime.h
+++ b/src/metkit/mars2grib/backend/deductions/significanceOfReferenceTime.h
@@ -54,7 +54,6 @@
 
 // Tables includes
 #include "metkit/mars2grib/backend/tables/significanceOfReferenceTime.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
@@ -162,9 +161,6 @@ tables::SignificanceOfReferenceTime resolve_SignificanceOfReferenceTime_or_throw
         std::throw_with_nested(Mars2GribDeductionException(
             "Failed to resolve `significanceOfReferenceTime` from input dictionaries", Here()));
     }
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/statisticsDescriptor.h b/src/metkit/mars2grib/backend/deductions/statisticsDescriptor.h
index a8de45f6..61b3e88f 100644
--- a/src/metkit/mars2grib/backend/deductions/statisticsDescriptor.h
+++ b/src/metkit/mars2grib/backend/deductions/statisticsDescriptor.h
@@ -9,7 +9,6 @@
 
 #include "eckit/exception/Exceptions.h"
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Deductions
 #include "metkit/mars2grib/backend/deductions/forecastTimeInSeconds.h"
@@ -167,17 +166,16 @@ inline StatisticalProcessing getTimeDescriptorFromMars_orThrow(
                 }
             }
 
-            return out;
+            break;  // TODO: Support multi-loop statistics
         }
+
+        return out;
     }
     catch (...) {
         // Rethrow nested exceptions
         std::throw_with_nested(
             Mars2GribDeductionException("Unable to compute statistics descriptor from Mars dictionary", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/stream.h b/src/metkit/mars2grib/backend/deductions/stream.h
index 43e2fc22..2e3efe6d 100644
--- a/src/metkit/mars2grib/backend/deductions/stream.h
+++ b/src/metkit/mars2grib/backend/deductions/stream.h
@@ -53,7 +53,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -117,9 +116,6 @@ std::string resolve_Stream_or_throw(const MarsDict_t& mars, const ParDict_t& par
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `stream` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/subCentre.h b/src/metkit/mars2grib/backend/deductions/subCentre.h
index 6ea4d7e5..8948301e 100644
--- a/src/metkit/mars2grib/backend/deductions/subCentre.h
+++ b/src/metkit/mars2grib/backend/deductions/subCentre.h
@@ -52,7 +52,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
diff --git a/src/metkit/mars2grib/backend/deductions/subSetTrunc.h b/src/metkit/mars2grib/backend/deductions/subSetTrunc.h
index 4ec09d93..be9f199e 100644
--- a/src/metkit/mars2grib/backend/deductions/subSetTrunc.h
+++ b/src/metkit/mars2grib/backend/deductions/subSetTrunc.h
@@ -49,7 +49,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -154,9 +153,6 @@ long resolve_SubSetTruncation_or_throw(const MarsDict_t& mars, const ParDict_t&
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `subSetTruncation` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/systemNumber.h b/src/metkit/mars2grib/backend/deductions/systemNumber.h
index 6b6fe4d2..2f1f0124 100644
--- a/src/metkit/mars2grib/backend/deductions/systemNumber.h
+++ b/src/metkit/mars2grib/backend/deductions/systemNumber.h
@@ -50,7 +50,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -111,9 +110,6 @@ long resolve_SystemNumber_or_throw(const MarsDict_t& mars, const ParDict_t& par,
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `systemNumber` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/tablesVersion.h b/src/metkit/mars2grib/backend/deductions/tablesVersion.h
index 9c336888..d9cd1b5c 100644
--- a/src/metkit/mars2grib/backend/deductions/tablesVersion.h
+++ b/src/metkit/mars2grib/backend/deductions/tablesVersion.h
@@ -53,7 +53,6 @@
 // Core deduction includes
 #include "metkit/codes/api/CodesAPI.h"
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
diff --git a/src/metkit/mars2grib/backend/deductions/timeIncrementInSeconds.h b/src/metkit/mars2grib/backend/deductions/timeIncrementInSeconds.h
index bb0ebae8..e652c3fe 100644
--- a/src/metkit/mars2grib/backend/deductions/timeIncrementInSeconds.h
+++ b/src/metkit/mars2grib/backend/deductions/timeIncrementInSeconds.h
@@ -9,7 +9,6 @@
 
 #include "eckit/exception/Exceptions.h"
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/config/LibMetkit.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
@@ -45,9 +44,6 @@ std::optional<long> timeIncrementInSeconds_opt(const MarsDict_t& mars, const Par
         std::throw_with_nested(
             Mars2GribDeductionException("Unable to get `timeIncrementInSeconds` from Mars dictionary", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
@@ -73,9 +69,6 @@ long timeIncrementInSeconds_or_throw(const MarsDict_t& mars, const ParDict_t& pa
         std::throw_with_nested(
             Mars2GribDeductionException("Unable to get `timeIncrementInSeconds` from Mars dictionary", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
diff --git a/src/metkit/mars2grib/backend/deductions/timeSpanInSeconds.h b/src/metkit/mars2grib/backend/deductions/timeSpanInSeconds.h
index e9db8ef8..f72d158c 100644
--- a/src/metkit/mars2grib/backend/deductions/timeSpanInSeconds.h
+++ b/src/metkit/mars2grib/backend/deductions/timeSpanInSeconds.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Exceptions
 #include "metkit/config/LibMetkit.h"
@@ -102,9 +101,6 @@ long resolve_TimeSpanInSeconds_or_throw(const MarsDict_t& mars, const ParDict_t&
         // Rethrow nested exceptions
         std::throw_with_nested(Mars2GribDeductionException("Unable to get `timespan` from Mars dictionary", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/type.h b/src/metkit/mars2grib/backend/deductions/type.h
index 63285376..36ce893c 100644
--- a/src/metkit/mars2grib/backend/deductions/type.h
+++ b/src/metkit/mars2grib/backend/deductions/type.h
@@ -53,7 +53,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -113,9 +112,6 @@ std::string resolve_Type_or_throw(const MarsDict_t& mars, const ParDict_t& par,
         // Rethrow nested exceptions
         std::throw_with_nested(Mars2GribDeductionException("Failed to resolve `type` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/typeOfEnsembleForecast.h b/src/metkit/mars2grib/backend/deductions/typeOfEnsembleForecast.h
index b6cd2229..2b8d5585 100644
--- a/src/metkit/mars2grib/backend/deductions/typeOfEnsembleForecast.h
+++ b/src/metkit/mars2grib/backend/deductions/typeOfEnsembleForecast.h
@@ -53,7 +53,6 @@
 
 // Tables includes
 #include "metkit/mars2grib/backend/tables/typeOfEnsembleForecast.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
@@ -162,9 +161,6 @@ tables::TypeOfEnsembleForecast resolve_TypeOfEnsembleForecast_or_throw(const Mar
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `typeOfEnsembleForecast` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
diff --git a/src/metkit/mars2grib/backend/deductions/typeOfGeneratingProcess.h b/src/metkit/mars2grib/backend/deductions/typeOfGeneratingProcess.h
index d18eca2f..2981ad90 100644
--- a/src/metkit/mars2grib/backend/deductions/typeOfGeneratingProcess.h
+++ b/src/metkit/mars2grib/backend/deductions/typeOfGeneratingProcess.h
@@ -53,7 +53,6 @@
 
 // Tables includes
 #include "metkit/mars2grib/backend/tables/typeOfGeneratingProcess.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
@@ -174,9 +173,6 @@ std::optional<tables::TypeOfGeneratingProcess> resolve_TypeOfGeneratingProcess_o
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `typeOfGeneratingProcess` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/typeOfProcessedData.h b/src/metkit/mars2grib/backend/deductions/typeOfProcessedData.h
index af4b78bd..c4a1e4a8 100644
--- a/src/metkit/mars2grib/backend/deductions/typeOfProcessedData.h
+++ b/src/metkit/mars2grib/backend/deductions/typeOfProcessedData.h
@@ -51,7 +51,6 @@
 
 // Tables includes
 #include "metkit/mars2grib/backend/tables/typeOfProcessedData.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
diff --git a/src/metkit/mars2grib/backend/deductions/waveDirectionGrid.h b/src/metkit/mars2grib/backend/deductions/waveDirectionGrid.h
index f1d8f481..2a8a3e96 100644
--- a/src/metkit/mars2grib/backend/deductions/waveDirectionGrid.h
+++ b/src/metkit/mars2grib/backend/deductions/waveDirectionGrid.h
@@ -61,7 +61,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -379,9 +378,6 @@ WaveDirectionGrid resolve_WaveDirectionGrid_or_throw(const MarsDict_t& mars, con
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `waveDirectionGrid` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 
diff --git a/src/metkit/mars2grib/backend/deductions/waveDirectionNumber.h b/src/metkit/mars2grib/backend/deductions/waveDirectionNumber.h
index 326b0545..b362f840 100644
--- a/src/metkit/mars2grib/backend/deductions/waveDirectionNumber.h
+++ b/src/metkit/mars2grib/backend/deductions/waveDirectionNumber.h
@@ -54,7 +54,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -113,9 +112,6 @@ long resolve_WaveDirectionNumber_or_throw(const MarsDict_t& mars, const ParDict_
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `waveDirectionNumber` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/deductions/waveFrequencyGrid.h b/src/metkit/mars2grib/backend/deductions/waveFrequencyGrid.h
index b1619cb2..467d7b34 100644
--- a/src/metkit/mars2grib/backend/deductions/waveFrequencyGrid.h
+++ b/src/metkit/mars2grib/backend/deductions/waveFrequencyGrid.h
@@ -57,7 +57,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -390,9 +389,6 @@ WaveFrequencyGrid resolve_WaveFrequencyGrid_or_throw(const MarsDict_t& mars, con
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `waveFrequencyGrid` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 
diff --git a/src/metkit/mars2grib/backend/deductions/waveFrequencyNumber.h b/src/metkit/mars2grib/backend/deductions/waveFrequencyNumber.h
index 2400affc..9b90aca0 100644
--- a/src/metkit/mars2grib/backend/deductions/waveFrequencyNumber.h
+++ b/src/metkit/mars2grib/backend/deductions/waveFrequencyNumber.h
@@ -54,7 +54,6 @@
 
 // Core deduction includes
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/logUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
@@ -113,9 +112,6 @@ long resolve_WaveFrequencyNumber_or_throw(const MarsDict_t& mars, const ParDict_
         std::throw_with_nested(
             Mars2GribDeductionException("Failed to resolve `waveFrequencyNumber` from input dictionaries", Here()));
     };
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 };
 
 }  // namespace metkit::mars2grib::backend::deductions
diff --git a/src/metkit/mars2grib/backend/encodeValues.h b/src/metkit/mars2grib/backend/encodeValues.h
index 419d2dea..19c64191 100644
--- a/src/metkit/mars2grib/backend/encodeValues.h
+++ b/src/metkit/mars2grib/backend/encodeValues.h
@@ -39,7 +39,6 @@
 
 // Project includes
 #include "metkit/codes/api/CodesTypes.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend {
diff --git a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer0.h b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer0.h
index 12b8d071..99c1f264 100644
--- a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer0.h
+++ b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer0.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::sections::initializers {
 
diff --git a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer1.h b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer1.h
index 38a34e78..6b734f80 100644
--- a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer1.h
+++ b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer1.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::sections::initializers {
 
diff --git a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer2.h b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer2.h
index 9f54a1fb..7649e019 100644
--- a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer2.h
+++ b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer2.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::sections::initializers {
 
@@ -116,8 +115,6 @@ void allocateTemplateNumber2(const MarsDict_t& mars, const ParDict_t& par, const
     catch (...) {
         std::throw_with_nested(Mars2GribGenericException("Error preparing section 2 with template number", Here()));
     }
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::sections::initializers
diff --git a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer3.h b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer3.h
index 32150fb0..ffd84d7a 100644
--- a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer3.h
+++ b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer3.h
@@ -38,7 +38,6 @@
 #include <vector>
 
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::sections::initializers {
@@ -116,8 +115,6 @@ void allocateTemplateNumber3(const MarsDict_t& mars, const ParDict_t& par, const
     catch (...) {
         std::throw_with_nested(Mars2GribGenericException("Error preparing section 3 with template number", Here()));
     }
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::sections::initializers
diff --git a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer4.h b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer4.h
index af20a4b2..66818f6d 100644
--- a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer4.h
+++ b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer4.h
@@ -30,7 +30,6 @@
 #pragma once
 
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::sections::initializers {
@@ -77,8 +76,6 @@ void allocateTemplateNumber4(const MarsDict_t& mars, const ParDict_t& par, const
     catch (...) {
         std::throw_with_nested(Mars2GribGenericException("Error preparing section 4 with template number", Here()));
     }
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::sections::initializers
diff --git a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer5.h b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer5.h
index e56b83d5..7b4739ff 100644
--- a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer5.h
+++ b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializer5.h
@@ -30,7 +30,6 @@
 #pragma once
 
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::sections::initializers {
@@ -77,8 +76,6 @@ void allocateTemplateNumber5(const MarsDict_t& mars, const ParDict_t& par, const
     catch (...) {
         std::throw_with_nested(Mars2GribGenericException("Error preparing section 5 with template number", Here()));
     }
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::sections::initializers
diff --git a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h
index e175894c..92076b85 100644
--- a/src/metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h
+++ b/src/metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h
@@ -38,7 +38,6 @@
 #include <utility>
 
 #include "metkit/mars2grib/backend/concepts/EncodingCallbacksRegistry.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::sections::initializers {
 
diff --git a/src/metkit/mars2grib/backend/sections/initializers/sectionRegistry.h b/src/metkit/mars2grib/backend/sections/initializers/sectionRegistry.h
index 14e3ed1a..eaa66a7a 100644
--- a/src/metkit/mars2grib/backend/sections/initializers/sectionRegistry.h
+++ b/src/metkit/mars2grib/backend/sections/initializers/sectionRegistry.h
@@ -44,7 +44,6 @@
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializer4.h"
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializer5.h"
 #include "metkit/mars2grib/backend/sections/initializers/sectionInitializerCore.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
diff --git a/src/metkit/mars2grib/backend/sections/resolver/ActiveConceptsData.h b/src/metkit/mars2grib/backend/sections/resolver/ActiveConceptsData.h
index 01fd86f7..23e214ab 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/ActiveConceptsData.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/ActiveConceptsData.h
@@ -40,7 +40,6 @@
 
 // Project includes
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::sections::resolver {
 
diff --git a/src/metkit/mars2grib/backend/sections/resolver/CompressionMask.h b/src/metkit/mars2grib/backend/sections/resolver/CompressionMask.h
index e88153c0..cc98f57b 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/CompressionMask.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/CompressionMask.h
@@ -145,7 +145,6 @@
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
 #include "metkit/mars2grib/backend/sections/resolver/ResolvedTemplateData.h"
 #include "metkit/mars2grib/backend/sections/resolver/TemplateSignatureKey.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::sections::resolver::detail {
diff --git a/src/metkit/mars2grib/backend/sections/resolver/Recipe.h b/src/metkit/mars2grib/backend/sections/resolver/Recipe.h
index a7fd91f6..db4d114b 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/Recipe.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/Recipe.h
@@ -53,7 +53,6 @@
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
 #include "metkit/mars2grib/backend/sections/resolver/ResolvedTemplateData.h"
 #include "metkit/mars2grib/backend/sections/resolver/Select.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::backend::sections::resolver::dsl {
diff --git a/src/metkit/mars2grib/backend/sections/resolver/Recipes.h b/src/metkit/mars2grib/backend/sections/resolver/Recipes.h
index 782fdaa5..5e3ad841 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/Recipes.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/Recipes.h
@@ -47,7 +47,6 @@
 // Project includes
 #include "metkit/mars2grib/backend/sections/resolver/Recipe.h"
 #include "metkit/mars2grib/backend/sections/resolver/ResolvedTemplateData.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::sections::resolver::dsl {
 
diff --git a/src/metkit/mars2grib/backend/sections/resolver/ResolvedTemplateData.h b/src/metkit/mars2grib/backend/sections/resolver/ResolvedTemplateData.h
index a934b360..060869f3 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/ResolvedTemplateData.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/ResolvedTemplateData.h
@@ -49,7 +49,6 @@
 
 // Project includes
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::sections::resolver::dsl {
 
diff --git a/src/metkit/mars2grib/backend/sections/resolver/SectionLayoutData.h b/src/metkit/mars2grib/backend/sections/resolver/SectionLayoutData.h
index 70fe1ca1..831ae007 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/SectionLayoutData.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/SectionLayoutData.h
@@ -40,7 +40,6 @@
 // Project includes
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
 #include "metkit/mars2grib/backend/sections/resolver/ResolvedTemplateData.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::sections::resolver {
@@ -150,8 +149,6 @@ inline SectionLayoutData make_SectionLayoutData_or_throw(std::size_t sectionNumb
     catch (...) {
         std::throw_with_nested(Mars2GribGenericException("Unable to create SectionLayoutData", Here()));
     }
-
-    mars2gribUnreachable();
 }
 
 }  // namespace detail
diff --git a/src/metkit/mars2grib/backend/sections/resolver/SectionTemplateSelector.h b/src/metkit/mars2grib/backend/sections/resolver/SectionTemplateSelector.h
index d1eb5d18..a876b358 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/SectionTemplateSelector.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/SectionTemplateSelector.h
@@ -44,7 +44,6 @@
 #include "metkit/mars2grib/backend/sections/resolver/Recipes.h"
 #include "metkit/mars2grib/backend/sections/resolver/SectionLayoutData.h"
 #include "metkit/mars2grib/backend/sections/resolver/TemplateSignatureKey.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::sections::resolver {
diff --git a/src/metkit/mars2grib/backend/sections/resolver/Select.h b/src/metkit/mars2grib/backend/sections/resolver/Select.h
index 8ce9720a..837f56b2 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/Select.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/Select.h
@@ -48,7 +48,6 @@
 
 // Project includes
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::sections::resolver::dsl {
@@ -137,8 +136,9 @@ struct Select {
             return GeneralRegistry::make_id_array_from_variants<Concept, Vs...>();
         }
 
-        // Remove compiler warning
-        mars2gribUnreachable();
+#if defined(__INTEL_COMPILER)
+        __builtin_unreachable();
+#endif
     }
 
 public:
diff --git a/src/metkit/mars2grib/backend/sections/resolver/TemplateSignatureKey.h b/src/metkit/mars2grib/backend/sections/resolver/TemplateSignatureKey.h
index d6ba969f..89c5bed6 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/TemplateSignatureKey.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/TemplateSignatureKey.h
@@ -46,7 +46,6 @@
 
 // Project includes
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::backend::sections::resolver::detail {
 
diff --git a/src/metkit/mars2grib/backend/sections/resolver/dsl.h b/src/metkit/mars2grib/backend/sections/resolver/dsl.h
index 369e5441..a0508658 100644
--- a/src/metkit/mars2grib/backend/sections/resolver/dsl.h
+++ b/src/metkit/mars2grib/backend/sections/resolver/dsl.h
@@ -2,5 +2,4 @@
 
 #include "metkit/mars2grib/backend/sections/resolver/Recipe.h"
 #include "metkit/mars2grib/backend/sections/resolver/Recipes.h"
-#include "metkit/mars2grib/backend/sections/resolver/Select.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
\ No newline at end of file
+#include "metkit/mars2grib/backend/sections/resolver/Select.h"
\ No newline at end of file
diff --git a/src/metkit/mars2grib/backend/tables/backgroundProcess.h b/src/metkit/mars2grib/backend/tables/backgroundProcess.h
index 2a7e40cd..b3962998 100644
--- a/src/metkit/mars2grib/backend/tables/backgroundProcess.h
+++ b/src/metkit/mars2grib/backend/tables/backgroundProcess.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
@@ -158,8 +157,6 @@ inline BackgroundProcess name2enum_BackgroundProcess_or_throw(const std::string&
             "'aifs-compo-single-mse', 'aifs-compo-ens-crps'}";
         throw Mars2GribTableException(errMsg, Here());
     }
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 ///
@@ -244,9 +241,6 @@ inline std::string enum2name_BackgroundProcess_or_throw(BackgroundProcess value)
             errMsg += std::to_string(static_cast<long>(value));
             throw Mars2GribTableException(errMsg, Here());
     }
-
-    // Remove compiler warning
-    mars2gribUnreachable();
 }
 
 
diff --git a/src/metkit/mars2grib/backend/tables/derivedForecast.h b/src/metkit/mars2grib/backend/tables/derivedForecast.h
index c52af0b3..cdbd7d61 100644
--- a/src/metkit/mars2grib/backend/tables/derivedForecast.h
+++ b/src/metkit/mars2grib/backend/tables/derivedForecast.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
diff --git a/src/metkit/mars2grib/backend/tables/productionStatusOfProcessedData.h b/src/metkit/mars2grib/backend/tables/productionStatusOfProcessedData.h
index ee086fc6..e8f1b6d0 100644
--- a/src/metkit/mars2grib/backend/tables/productionStatusOfProcessedData.h
+++ b/src/metkit/mars2grib/backend/tables/productionStatusOfProcessedData.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
@@ -107,8 +106,6 @@ inline std::string enum2name_ProductionStatusOfProcessedData_or_throw(Production
         default:
             throw Mars2GribTableException("Invalid ProductionStatusOfProcessedData enum value", Here());
     }
-
-    mars2gribUnreachable();
 }
 
 ///
@@ -157,8 +154,6 @@ inline ProductionStatusOfProcessedData name2enum_ProductionStatusOfProcessedData
         return ProductionStatusOfProcessedData::Missing;
 
     throw Mars2GribTableException("Invalid ProductionStatusOfProcessedData name: '" + name + "'", Here());
-
-    mars2gribUnreachable();
 }
 
 ///
@@ -210,8 +205,6 @@ inline ProductionStatusOfProcessedData long2enum_ProductionStatusOfProcessedData
             throw Mars2GribTableException(
                 "Invalid ProductionStatusOfProcessedData numeric value: " + std::to_string(value), Here());
     }
-
-    mars2gribUnreachable();
 }
 
 
diff --git a/src/metkit/mars2grib/backend/tables/shapeOfTheReferenceSystem.h b/src/metkit/mars2grib/backend/tables/shapeOfTheReferenceSystem.h
index d4d09dd1..ad45e0dd 100644
--- a/src/metkit/mars2grib/backend/tables/shapeOfTheReferenceSystem.h
+++ b/src/metkit/mars2grib/backend/tables/shapeOfTheReferenceSystem.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
diff --git a/src/metkit/mars2grib/backend/tables/significanceOfReferenceTime.h b/src/metkit/mars2grib/backend/tables/significanceOfReferenceTime.h
index d8e792fb..d10ee740 100644
--- a/src/metkit/mars2grib/backend/tables/significanceOfReferenceTime.h
+++ b/src/metkit/mars2grib/backend/tables/significanceOfReferenceTime.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 
@@ -119,8 +118,6 @@ inline SignificanceOfReferenceTime name2enum_SignificanceOfReferenceTime_or_thro
         errMsg += "actual='" + value + "'";
         throw Mars2GribTableException(errMsg, Here());
     }
-
-    mars2gribUnreachable();
 }
 
 ///
@@ -171,8 +168,6 @@ inline std::string enum2name_SignificanceOfReferenceTime_or_throw(SignificanceOf
             throw Mars2GribTableException(errMsg, Here());
         }
     }
-
-    mars2gribUnreachable();
 }
 
 
diff --git a/src/metkit/mars2grib/backend/tables/timeUnits.h b/src/metkit/mars2grib/backend/tables/timeUnits.h
index 9c476a29..d4b61c7d 100644
--- a/src/metkit/mars2grib/backend/tables/timeUnits.h
+++ b/src/metkit/mars2grib/backend/tables/timeUnits.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 
@@ -127,8 +126,6 @@ inline TimeUnit name2enum_TimeUnit_or_throw(const std::string& name) {
                       "', expected={minute,hour,day,month,year,decade,normal,century,"
                       "3h,6h,12h,second,missing}";
     throw Mars2GribTableException(err, Here());
-
-    mars2gribUnreachable();
 }
 
 ///
@@ -185,8 +182,6 @@ inline std::string enum2name_TimeUnit_or_throw(TimeUnit value) {
 
     std::string err = "Invalid TimeUnit enum value: actual='" + std::to_string(static_cast<long>(value)) + "'";
     throw Mars2GribTableException(err, Here());
-
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::tables
\ No newline at end of file
diff --git a/src/metkit/mars2grib/backend/tables/typeOfEnsembleForecast.h b/src/metkit/mars2grib/backend/tables/typeOfEnsembleForecast.h
index 6da40ace..ebc11a17 100644
--- a/src/metkit/mars2grib/backend/tables/typeOfEnsembleForecast.h
+++ b/src/metkit/mars2grib/backend/tables/typeOfEnsembleForecast.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
diff --git a/src/metkit/mars2grib/backend/tables/typeOfGeneratingProcess.h b/src/metkit/mars2grib/backend/tables/typeOfGeneratingProcess.h
index 39231f53..e30d77f5 100644
--- a/src/metkit/mars2grib/backend/tables/typeOfGeneratingProcess.h
+++ b/src/metkit/mars2grib/backend/tables/typeOfGeneratingProcess.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
@@ -147,8 +146,6 @@ inline TypeOfGeneratingProcess name2enum_TypeOfGeneratingProcess_or_throw(const
         errMsg += "actual='" + value + "'";
         throw Mars2GribTableException(errMsg, Here());
     }
-
-    mars2gribUnreachable();
 }
 
 ///
@@ -231,8 +228,6 @@ inline std::string enum2name_TypeOfGeneratingProcess_or_throw(TypeOfGeneratingPr
             errMsg += std::to_string(static_cast<long>(value));
             throw Mars2GribTableException(errMsg, Here());
     }
-
-    mars2gribUnreachable();
 }
 
 }  // namespace metkit::mars2grib::backend::tables
\ No newline at end of file
diff --git a/src/metkit/mars2grib/backend/tables/typeOfInterval.h b/src/metkit/mars2grib/backend/tables/typeOfInterval.h
index 770b6282..3fb9c92a 100644
--- a/src/metkit/mars2grib/backend/tables/typeOfInterval.h
+++ b/src/metkit/mars2grib/backend/tables/typeOfInterval.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
diff --git a/src/metkit/mars2grib/backend/tables/typeOfProcessedData.h b/src/metkit/mars2grib/backend/tables/typeOfProcessedData.h
index 04278bde..dc70d375 100644
--- a/src/metkit/mars2grib/backend/tables/typeOfProcessedData.h
+++ b/src/metkit/mars2grib/backend/tables/typeOfProcessedData.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
@@ -113,8 +112,6 @@ inline TypeOfProcessedData name2enum_TypeOfProcessedData_or_throw(const std::str
     std::string errMsg = "Invalid TypeOfProcessedData name: ";
     errMsg += "actual='" + value + "'";
     throw Mars2GribTableException(errMsg, Here());
-
-    mars2gribUnreachable();
 }
 
 
@@ -202,8 +199,6 @@ inline TypeOfProcessedData long2enum_TypeOfProcessedData_or_throw(long value) {
             throw Mars2GribTableException("Invalid GRIB value for `typeOfProcessedData`: " + std::to_string(value),
                                           Here());
     }
-
-    mars2gribUnreachable();
 }
 
 
diff --git a/src/metkit/mars2grib/backend/tables/typeOfStatisticalProcessing.h b/src/metkit/mars2grib/backend/tables/typeOfStatisticalProcessing.h
index 8af72a1f..07197dc2 100644
--- a/src/metkit/mars2grib/backend/tables/typeOfStatisticalProcessing.h
+++ b/src/metkit/mars2grib/backend/tables/typeOfStatisticalProcessing.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 
@@ -142,8 +141,6 @@ inline TypeOfStatisticalProcessing name2enum_TypeOfStatisticalProcessing_or_thro
                       "covariance,difference_start_minus_end,ratio,standardized_anomaly,"
                       "summation,return_period,median,severity,mode,index_processing,missing}";
     throw Mars2GribTableException(err, Here());
-
-    mars2gribUnreachable();
 }
 
 ///
@@ -207,8 +204,6 @@ inline std::string enum2name_TypeOfStatisticalProcessing_or_throw(TypeOfStatisti
     std::string err =
         "Invalid TypeOfStatisticalProcessing enum value: actual='" + std::to_string(static_cast<long>(value)) + "'";
     throw Mars2GribTableException(err, Here());
-
-    mars2gribUnreachable();
 }
 
 
diff --git a/src/metkit/mars2grib/backend/tables/typeOfTimeIntervals.h b/src/metkit/mars2grib/backend/tables/typeOfTimeIntervals.h
index 0384ba16..793c8edd 100644
--- a/src/metkit/mars2grib/backend/tables/typeOfTimeIntervals.h
+++ b/src/metkit/mars2grib/backend/tables/typeOfTimeIntervals.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::backend::tables {
diff --git a/src/metkit/mars2grib/frontend/GribHeaderLayoutData.h b/src/metkit/mars2grib/frontend/GribHeaderLayoutData.h
index 3b897a8a..451a9700 100644
--- a/src/metkit/mars2grib/frontend/GribHeaderLayoutData.h
+++ b/src/metkit/mars2grib/frontend/GribHeaderLayoutData.h
@@ -29,7 +29,6 @@
 // Project includes
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
 #include "metkit/mars2grib/backend/sections/resolver/SectionLayoutData.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend {
 
diff --git a/src/metkit/mars2grib/frontend/header/EncodingPlan.h b/src/metkit/mars2grib/frontend/header/EncodingPlan.h
index 55fbb475..6acc9bd8 100644
--- a/src/metkit/mars2grib/frontend/header/EncodingPlan.h
+++ b/src/metkit/mars2grib/frontend/header/EncodingPlan.h
@@ -39,7 +39,6 @@
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
 #include "metkit/mars2grib/backend/sections/initializers/sectionRegistry.h"
 #include "metkit/mars2grib/frontend/GribHeaderLayoutData.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::frontend::header::detail {
diff --git a/src/metkit/mars2grib/frontend/header/SpecializedEncoder.h b/src/metkit/mars2grib/frontend/header/SpecializedEncoder.h
index 3fc5de1a..5cc4e677 100644
--- a/src/metkit/mars2grib/frontend/header/SpecializedEncoder.h
+++ b/src/metkit/mars2grib/frontend/header/SpecializedEncoder.h
@@ -110,7 +110,6 @@
 // Project includes
 #include "metkit/mars2grib/frontend/GribHeaderLayoutData.h"
 #include "metkit/mars2grib/frontend/header/EncodingPlan.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::frontend::header {
diff --git a/src/metkit/mars2grib/frontend/make_HeaderLayout.h b/src/metkit/mars2grib/frontend/make_HeaderLayout.h
index adb49190..fac3ac95 100644
--- a/src/metkit/mars2grib/frontend/make_HeaderLayout.h
+++ b/src/metkit/mars2grib/frontend/make_HeaderLayout.h
@@ -32,7 +32,6 @@
 #include "metkit/mars2grib/frontend/GribHeaderLayoutData.h"
 #include "metkit/mars2grib/frontend/resolution/resolveActiveConcepts.h"
 #include "metkit/mars2grib/frontend/resolution/resolveSectionsLayout.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
diff --git a/src/metkit/mars2grib/frontend/normalization/normalizeMarsDict.h b/src/metkit/mars2grib/frontend/normalization/normalizeMarsDict.h
index 8512bc09..24d8bef5 100644
--- a/src/metkit/mars2grib/frontend/normalization/normalizeMarsDict.h
+++ b/src/metkit/mars2grib/frontend/normalization/normalizeMarsDict.h
@@ -22,7 +22,6 @@
 #include "eckit/value/Value.h"
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/normalizeMiscDict.h b/src/metkit/mars2grib/frontend/normalization/normalizeMiscDict.h
index 237c2cd9..b657a3da 100644
--- a/src/metkit/mars2grib/frontend/normalization/normalizeMiscDict.h
+++ b/src/metkit/mars2grib/frontend/normalization/normalizeMiscDict.h
@@ -23,7 +23,6 @@
 // Project includes
 #include "eckit/value/Value.h"
 #include "metkit/mars2grib/utils/enableOptions.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/SanitizationRegistry.h b/src/metkit/mars2grib/frontend/normalization/per_key/SanitizationRegistry.h
index 67ddca19..d26a175d 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/SanitizationRegistry.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/SanitizationRegistry.h
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 #include "metkit/mars2grib/frontend/normalization/per_key/mars/All.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/All.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/All.h
index 3a03e04c..b9067361 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/All.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/All.h
@@ -35,4 +35,3 @@
 #include "metkit/mars2grib/frontend/normalization/per_key/mars/truncation.h"
 #include "metkit/mars2grib/frontend/normalization/per_key/mars/type.h"
 #include "metkit/mars2grib/frontend/normalization/per_key/mars/wavelength.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/activity.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/activity.h
index d9e6ee6f..87db4653 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/activity.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/activity.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/anoffset.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/anoffset.h
index a81c52c3..348cfc91 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/anoffset.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/anoffset.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/channel.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/channel.h
index 5f8cdf46..e04da670 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/channel.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/channel.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/chem.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/chem.h
index faf0b7e7..c2bf1d31 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/chem.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/chem.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/class.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/class.h
index 2b453dc1..84b40af5 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/class.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/class.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/dataset.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/dataset.h
index 62bc5543..1d55fa3a 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/dataset.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/dataset.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/date.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/date.h
index 73356cd8..01345c48 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/date.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/date.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/direction.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/direction.h
index 75112112..42367eff 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/direction.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/direction.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/domain.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/domain.h
index 3fb6f2d9..2c4f0f68 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/domain.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/domain.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/experiment.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/experiment.h
index 47a45d5f..d2b0d7f2 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/experiment.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/experiment.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/expver.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/expver.h
index 2d31f283..357f722e 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/expver.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/expver.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/frequency.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/frequency.h
index b96cd018..924ff65b 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/frequency.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/frequency.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/generation.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/generation.h
index c12b38da..dc751251 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/generation.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/generation.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/grid.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/grid.h
index a65e79f9..e3e263a7 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/grid.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/grid.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/hdate.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/hdate.h
index 72773b9a..99f1ad31 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/hdate.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/hdate.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/htime.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/htime.h
index 071414e6..12f42516 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/htime.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/htime.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/ident.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/ident.h
index fdd1f063..11d57910 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/ident.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/ident.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/instrument.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/instrument.h
index 6411ff3d..55d7ff0b 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/instrument.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/instrument.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/level.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/level.h
index 06ba6d2c..2b2fc811 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/level.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/level.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/levelist.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/levelist.h
index 56fefff3..fde8cf1a 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/levelist.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/levelist.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/levtype.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/levtype.h
index 87ba65aa..61101534 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/levtype.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/levtype.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/method.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/method.h
index e4a70c3d..e47c86b2 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/method.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/method.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/model.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/model.h
index 9977700f..17e7587d 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/model.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/model.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/number.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/number.h
index 2559ebc9..5125b290 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/number.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/number.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/origin.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/origin.h
index 02ce388c..4731edc4 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/origin.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/origin.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/packing.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/packing.h
index 24d59bf8..148298d9 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/packing.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/packing.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/param.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/param.h
index 2ddebf4a..bc4bda4f 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/param.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/param.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/realization.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/realization.h
index 4e3f350a..90c12433 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/realization.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/realization.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/resolution.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/resolution.h
index a8380499..7c5f60d4 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/resolution.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/resolution.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/stattype.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/stattype.h
index 8515150e..0e9ef2f6 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/stattype.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/stattype.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/step.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/step.h
index 5f699f31..9fdbc2eb 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/step.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/step.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/stream.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/stream.h
index df276f42..4b6cb0f1 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/stream.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/stream.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/system.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/system.h
index bbf86efb..e4f424da 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/system.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/system.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/time.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/time.h
index 8047cf87..1b0ee643 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/time.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/time.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/timespan.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/timespan.h
index 5785a1d4..fb013cde 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/timespan.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/timespan.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/truncation.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/truncation.h
index 2d19ba70..cf9d2027 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/truncation.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/truncation.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/type.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/type.h
index 9389b912..3792e7d6 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/type.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/type.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/normalization/per_key/mars/wavelength.h b/src/metkit/mars2grib/frontend/normalization/per_key/mars/wavelength.h
index 1ee12d27..cc7341a8 100644
--- a/src/metkit/mars2grib/frontend/normalization/per_key/mars/wavelength.h
+++ b/src/metkit/mars2grib/frontend/normalization/per_key/mars/wavelength.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "eckit/value/Value.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::normalization::per_key {
 
diff --git a/src/metkit/mars2grib/frontend/resolution/resolveActiveConcepts.h b/src/metkit/mars2grib/frontend/resolution/resolveActiveConcepts.h
index 732b7169..3cb354c6 100644
--- a/src/metkit/mars2grib/frontend/resolution/resolveActiveConcepts.h
+++ b/src/metkit/mars2grib/frontend/resolution/resolveActiveConcepts.h
@@ -22,7 +22,6 @@
 #include "metkit/mars2grib/backend/concepts/GeneralRegistry.h"
 #include "metkit/mars2grib/backend/concepts/MatchingCallbacksRegistry.h"
 #include "metkit/mars2grib/backend/sections/resolver/ActiveConceptsData.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::frontend::resolution {
@@ -94,8 +93,6 @@ ActiveConceptsData resolve_ActiveConcepts_or_throw(const MarsDict_t& marsDict, c
     catch (...) {
         std::throw_with_nested(Mars2GribGenericException("Unable to match ActiveConcepts", Here()));
     }
-
-    mars2gribUnreachable();
 };
 
 
diff --git a/src/metkit/mars2grib/frontend/resolution/resolveSectionsLayout.h b/src/metkit/mars2grib/frontend/resolution/resolveSectionsLayout.h
index 8e3a4bd5..784a68d5 100644
--- a/src/metkit/mars2grib/frontend/resolution/resolveSectionsLayout.h
+++ b/src/metkit/mars2grib/frontend/resolution/resolveSectionsLayout.h
@@ -31,7 +31,6 @@
 #include "metkit/mars2grib/backend/sections/resolver/SectionLayoutData.h"
 #include "metkit/mars2grib/frontend/GribHeaderLayoutData.h"
 #include "metkit/mars2grib/frontend/resolution/section-recipes/SectionTemplateSelectors.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
 
 namespace metkit::mars2grib::frontend::resolution {
@@ -100,8 +99,6 @@ inline std::array<SectionLayoutData, backend::concepts_::GeneralRegistry::NSecti
         std::throw_with_nested(
             Mars2GribGenericException("Critical failure: Unable to resolve GRIB HeaderLayout", Here()));
     }
-
-    mars2gribUnreachable();
 }
 
 ///
diff --git a/src/metkit/mars2grib/frontend/resolution/section-recipes/SectionTemplateSelectors.h b/src/metkit/mars2grib/frontend/resolution/section-recipes/SectionTemplateSelectors.h
index 5256b78a..e51035a3 100644
--- a/src/metkit/mars2grib/frontend/resolution/section-recipes/SectionTemplateSelectors.h
+++ b/src/metkit/mars2grib/frontend/resolution/section-recipes/SectionTemplateSelectors.h
@@ -9,7 +9,6 @@
 #include "metkit/mars2grib/frontend/resolution/section-recipes/impl/section3Recipes.h"
 #include "metkit/mars2grib/frontend/resolution/section-recipes/impl/section4Recipes.h"
 #include "metkit/mars2grib/frontend/resolution/section-recipes/impl/section5Recipes.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::resolution::recipes {
 
diff --git a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section0Recipes.h b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section0Recipes.h
index fcdec15f..a54f23d9 100644
--- a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section0Recipes.h
+++ b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section0Recipes.h
@@ -6,7 +6,6 @@
 
 // All elements needed to used the "dsl" objects to define recipes
 #include "metkit/mars2grib/backend/sections/resolver/dsl.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::resolution::recipes::impl {
 
diff --git a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section1Recipes.h b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section1Recipes.h
index 92568ef6..8b077b9b 100644
--- a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section1Recipes.h
+++ b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section1Recipes.h
@@ -6,7 +6,6 @@
 
 // All elements needed to used the "dsl" objects to define recipes
 #include "metkit/mars2grib/backend/sections/resolver/dsl.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::resolution::recipes::impl {
 
diff --git a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section2Recipes.h b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section2Recipes.h
index 16fcb994..b58e95bb 100644
--- a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section2Recipes.h
+++ b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section2Recipes.h
@@ -6,7 +6,6 @@
 
 // All elements needed to used the "dsl" objects to define recipes
 #include "metkit/mars2grib/backend/sections/resolver/dsl.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::resolution::recipes::impl {
 
diff --git a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section3Recipes.h b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section3Recipes.h
index 4364abf1..fecf3c43 100644
--- a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section3Recipes.h
+++ b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section3Recipes.h
@@ -6,7 +6,6 @@
 
 // All elements needed to used the "dsl" objects to define recipes
 #include "metkit/mars2grib/backend/sections/resolver/dsl.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::resolution::recipes::impl {
 
diff --git a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section4Recipes.h b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section4Recipes.h
index 498d24e6..9ba02ec8 100644
--- a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section4Recipes.h
+++ b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section4Recipes.h
@@ -4,7 +4,6 @@
 
 // All elements needed to used the "dsl" objects to define recipes
 #include "metkit/mars2grib/backend/sections/resolver/dsl.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::resolution::recipes::impl {
 
diff --git a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section5Recipes.h b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section5Recipes.h
index c940e3fe..c4aeb32b 100644
--- a/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section5Recipes.h
+++ b/src/metkit/mars2grib/frontend/resolution/section-recipes/impl/section5Recipes.h
@@ -6,7 +6,6 @@
 
 // All elements needed to used the "dsl" objects to define recipes
 #include "metkit/mars2grib/backend/sections/resolver/dsl.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::frontend::resolution::recipes::impl {
 
diff --git a/src/metkit/mars2grib/utils/configConverter.h b/src/metkit/mars2grib/utils/configConverter.h
index 2038e6f3..8c5f82b8 100644
--- a/src/metkit/mars2grib/utils/configConverter.h
+++ b/src/metkit/mars2grib/utils/configConverter.h
@@ -6,7 +6,6 @@
 
 #include "eckit/config/LocalConfiguration.h"
 #include "eckit/log/Log.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 #include "metkit/mars2grib/backend/concepts/concept_registry.h"
diff --git a/src/metkit/mars2grib/utils/dictionary_traits/dictaccess_codes_handle.h b/src/metkit/mars2grib/utils/dictionary_traits/dictaccess_codes_handle.h
index be8ef413..40d4fe1d 100644
--- a/src/metkit/mars2grib/utils/dictionary_traits/dictaccess_codes_handle.h
+++ b/src/metkit/mars2grib/utils/dictionary_traits/dictaccess_codes_handle.h
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include "eckit/io/Buffer.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/codes/api/CodesAPI.h"
 #include "metkit/codes/api/CodesTypes.h"
@@ -64,7 +63,6 @@
                         "` from dictionary `"s + std::string(type_name<metkit::codes::CodesHandle>()) + "`",   \
                     Here()));                                                                                  \
             }                                                                                                  \
-            mars2gribUnreachable();                                                                            \
         }                                                                                                      \
     };
 
@@ -92,7 +90,6 @@
             catch (...) {                                                           \
                 return std::nullopt;                                                \
             }                                                                       \
-            mars2gribUnreachable();                                                 \
         }                                                                           \
     };
 
@@ -120,7 +117,6 @@
                         "` in dictionary `"s + std::string(type_name<metkit::codes::CodesHandle>()) + "`", \
                     Here()));                                                                              \
             }                                                                                              \
-            mars2gribUnreachable();                                                                        \
         }                                                                                                  \
     };
 
@@ -142,7 +138,6 @@
             catch (...) {                                                              \
                 return;                                                                \
             }                                                                          \
-            mars2gribUnreachable();                                                    \
         }                                                                              \
     };
 
@@ -237,7 +232,6 @@ struct DictHas<metkit::codes::CodesHandle> {
                     std::string(type_name<metkit::codes::CodesHandle>()) + "`",
                 Here()));
         }
-        mars2gribUnreachable();
     }
 };
 
@@ -258,7 +252,6 @@ struct DictMissing<metkit::codes::CodesHandle> {
                     std::string(type_name<metkit::codes::CodesHandle>()) + "`",
                 Here()));
         }
-        mars2gribUnreachable();
     }
 
     static void setMissing(metkit::codes::CodesHandle& h, std::string_view key) noexcept(false) {
@@ -272,7 +265,6 @@ struct DictMissing<metkit::codes::CodesHandle> {
                     std::string(type_name<metkit::codes::CodesHandle>()) + "`",
                 Here()));
         }
-        mars2gribUnreachable();
     }
 };
 
diff --git a/src/metkit/mars2grib/utils/dictionary_traits/dictaccess_eckit_configuration.h b/src/metkit/mars2grib/utils/dictionary_traits/dictaccess_eckit_configuration.h
index ad4b29ea..7142d9d7 100644
--- a/src/metkit/mars2grib/utils/dictionary_traits/dictaccess_eckit_configuration.h
+++ b/src/metkit/mars2grib/utils/dictionary_traits/dictaccess_eckit_configuration.h
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include "eckit/config/LocalConfiguration.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #include "metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h"
 #include "metkit/mars2grib/utils/mars2gribExceptions.h"
@@ -62,7 +61,6 @@
                         "` from dictionary type `"s + std::string(type_name<eckit::LocalConfiguration>()) + "`",       \
                     Here()));                                                                                          \
             }                                                                                                          \
-            mars2gribUnreachable();                                                                                    \
         }                                                                                                              \
     };
 
@@ -91,7 +89,6 @@
             catch (...) {                                                           \
                 return std::nullopt;                                                \
             }                                                                       \
-            mars2gribUnreachable();                                                 \
         }                                                                           \
     };
 
@@ -111,7 +108,6 @@
             }                                                                           \
             catch (...) {                                                               \
             }                                                                           \
-            mars2gribUnreachable();                                                     \
         }                                                                               \
     };
 
@@ -140,7 +136,6 @@
                         "` in dictionary type `"s + std::string(type_name<eckit::LocalConfiguration>()) + "`", \
                     Here()));                                                                                  \
             }                                                                                                  \
-            mars2gribUnreachable();                                                                            \
         }                                                                                                      \
     };
 
@@ -265,7 +260,6 @@ struct DictHas<eckit::LocalConfiguration> {
                     std::string(type_name<eckit::LocalConfiguration>()) + "`",
                 Here()));
         }
-        mars2gribUnreachable();
     }
 };
 
diff --git a/src/metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h b/src/metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h
index 3919e49b..f82beadd 100644
--- a/src/metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h
+++ b/src/metkit/mars2grib/utils/dictionary_traits/dictionary_access_traits.h
@@ -11,7 +11,6 @@
 #include <utility>
 
 #include "eckit/exception/Exceptions.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 // Exceptions
 #include "metkit/config/LibMetkit.h"
@@ -55,7 +54,7 @@ struct DictHas {
 
     static bool has(const Dict&, std::string_view) noexcept(false) {
         static_assert(dependent_false<Dict>::value, "DictHas not specialized for this Dict");
-        mars2gribUnreachable();
+        return false;  // Unreachable!
     }
 };
 
@@ -65,12 +64,11 @@ struct DictMissing {
 
     static bool isMissing(const Dict&, std::string_view) noexcept(false) {
         static_assert(dependent_false<Dict>::value, "DictMissing not specialized for this Dict");
-        mars2gribUnreachable();
+        return false;  // Unreachable!
     }
 
     static void setMissing(Dict&, std::string_view) noexcept(false) {
         static_assert(dependent_false<Dict>::value, "DictMissing not specialized for this Dict");
-        mars2gribUnreachable();
     }
 };
 
@@ -79,7 +77,6 @@ struct DictGetOpt {
 
     static std::optional<T> get_opt(const Dict&, std::string_view) noexcept(false) {
         static_assert(dependent_false<Dict>::value, "DictGetOpt not specialized for this Dict and type");
-        mars2gribUnreachable();
     }
 };
 
@@ -88,7 +85,6 @@ struct DictGetOrThrow {
 
     static T get_or_throw(const Dict&, std::string_view) noexcept(false) {
         static_assert(dependent_false<Dict>::value, "DictGetOrThrow not specialized for this Dict and type");
-        mars2gribUnreachable();
     }
 };
 
@@ -96,7 +92,6 @@ template <class Dict, class T>
 struct DictSetOrIgnore {
     static void set_or_ignore(Dict&, std::string_view, const T&) noexcept(false) {
         static_assert(dependent_false<Dict>::value, "DictSetOrIgnore not specialized for this Dict and type");
-        mars2gribUnreachable();
     }
 };
 
@@ -105,7 +100,6 @@ template <class Dict, class T>
 struct DictSetOrThrow {
     static void set_or_throw(Dict&, std::string_view, const T&) noexcept(false) {
         static_assert(dependent_false<Dict>::value, "DictSetOrThrow not specialized for this Dict and type");
-        mars2gribUnreachable();
     }
 };
 
@@ -194,9 +188,7 @@ inline T get_or_throw(const Dict& dict, std::string_view key) {
             exceptions::Mars2GribDictException("Forwarding errors while getting key `"s + std::string(key) + "` as `" +
                                                    std::string(type_name<T>()) + "` from dictionary`"s,
                                                Here()));
-        mars2gribUnreachable();
     }
-    mars2gribUnreachable();
 }
 
 // get<T>(dict,key) -> std::optional<T>
@@ -208,7 +200,6 @@ inline std::optional<T> get_opt(const Dict& dict, std::string_view key) {
     catch (...) {
         return std::nullopt;
     }
-    mars2gribUnreachable();
 }
 
 
@@ -228,22 +219,18 @@ inline void set_or_throw(Dict& dict, std::string_view key, const T& value) {
                                                                       std::string(key) + "` as `" +
                                                                       std::string(type_name<T>()) + "` to dictionary`"s,
                                                                   Here()));
-        mars2gribUnreachable();
     }
-    mars2gribUnreachable();
 }
 
 template <class T, class Dict>
 inline void set_or_ignore(Dict& dict, std::string_view key, const T& value) {
     try {
         DictSetOrIgnore<Dict, T>::set_or_ignore(dict, key, value);
-        return;
     }
     catch (...) {
         // ignore exceptions
-        mars2gribUnreachable();
     }
-    mars2gribUnreachable();
+    return;
 }
 
 
diff --git a/src/metkit/mars2grib/utils/enableOptions.h b/src/metkit/mars2grib/utils/enableOptions.h
index 6739e143..b6015bea 100644
--- a/src/metkit/mars2grib/utils/enableOptions.h
+++ b/src/metkit/mars2grib/utils/enableOptions.h
@@ -10,7 +10,6 @@
 #pragma once
 
 #include "metkit/mars2grib/api/Options.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::utils {
 
diff --git a/src/metkit/mars2grib/utils/generalUtils.h b/src/metkit/mars2grib/utils/generalUtils.h
deleted file mode 100644
index b7d5190c..00000000
--- a/src/metkit/mars2grib/utils/generalUtils.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define mars2gribUnreachable() __builtin_unreachable()
\ No newline at end of file
diff --git a/src/metkit/mars2grib/utils/logUtils.h b/src/metkit/mars2grib/utils/logUtils.h
index 1a2d3a88..f612c32c 100644
--- a/src/metkit/mars2grib/utils/logUtils.h
+++ b/src/metkit/mars2grib/utils/logUtils.h
@@ -2,7 +2,6 @@
 
 #include "eckit/log/Log.h"
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 #define MARS2GRIB_LOG_CHECK(msg)                                                        \
     do {                                                                                \
diff --git a/src/metkit/mars2grib/utils/mars2gribExceptions.h b/src/metkit/mars2grib/utils/mars2gribExceptions.h
index e6a52edb..6b80d65b 100644
--- a/src/metkit/mars2grib/utils/mars2gribExceptions.h
+++ b/src/metkit/mars2grib/utils/mars2gribExceptions.h
@@ -44,7 +44,6 @@
 // Project includes
 #include "eckit/exception/Exceptions.h"
 #include "metkit/config/LibMetkit.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 
 namespace metkit::mars2grib::utils::exceptions {
diff --git a/src/metkit/mars2grib/utils/type_traits_name.h b/src/metkit/mars2grib/utils/type_traits_name.h
index 3ade8c7f..c1761354 100644
--- a/src/metkit/mars2grib/utils/type_traits_name.h
+++ b/src/metkit/mars2grib/utils/type_traits_name.h
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "metkit/codes/api/CodesTypes.h"
-#include "metkit/mars2grib/utils/generalUtils.h"
 
 namespace metkit::mars2grib::utils {