diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdccb8e4b..4603ae1de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,7 @@ include(${PROJECT_SOURCE_DIR}/cmake/z3_add_cxx_flag.cmake)
 ################################################################################
 # C++ language version
 ################################################################################
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 ################################################################################
diff --git a/scripts/mk_util.py b/scripts/mk_util.py
index 3e6da0b22..e0f029a3b 100644
--- a/scripts/mk_util.py
+++ b/scripts/mk_util.py
@@ -2007,11 +2007,11 @@ class MLComponent(Component):
             src_dir = self.to_src_dir
             mk_dir(os.path.join(BUILD_DIR, self.sub_dir))
             api_src = get_component(API_COMPONENT).to_src_dir
-            # remove /GL and -std=c++17; the ocaml tools don't like them.
+            # remove /GL and -std=c++20; the ocaml tools don't like them.
             if IS_WINDOWS:
                 out.write('CXXFLAGS_OCAML=$(CXXFLAGS:/GL=)\n')
             else:
-                out.write('CXXFLAGS_OCAML=$(subst -std=c++17,,$(CXXFLAGS))\n')
+                out.write('CXXFLAGS_OCAML=$(subst -std=c++20,,$(CXXFLAGS))\n')
 
             substitutions = { 'VERSION': "{}.{}.{}.{}".format(VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK) }
 
@@ -2500,7 +2500,7 @@ def mk_config():
     config = open(os.path.join(BUILD_DIR, 'config.mk'), 'w')
     global CXX, CC, GMP, GUARD_CF, STATIC_BIN, GIT_HASH, CPPFLAGS, CXXFLAGS, LDFLAGS, EXAMP_DEBUG_FLAG, FPMATH_FLAGS, LOG_SYNC, SINGLE_THREADED, IS_ARCH_ARM64
     if IS_WINDOWS:
-        CXXFLAGS = '/nologo /Zi /D WIN32 /D _WINDOWS /EHsc /GS /Gd /std:c++17'
+        CXXFLAGS = '/nologo /Zi /D WIN32 /D _WINDOWS /EHsc /GS /Gd /std:C++20'
         config.write(
             'CC=cl\n'
             'CXX=cl\n'
@@ -2616,7 +2616,7 @@ def mk_config():
             CPPFLAGS = '%s -D_MP_INTERNAL' % CPPFLAGS
         if GIT_HASH:
             CPPFLAGS = '%s -DZ3GITHASH=%s' % (CPPFLAGS, GIT_HASH)
-        CXXFLAGS = '%s -std=c++17' % CXXFLAGS
+        CXXFLAGS = '%s -std=C++20' % CXXFLAGS
         CXXFLAGS = '%s -fvisibility=hidden -fvisibility-inlines-hidden -c' % CXXFLAGS
         FPMATH = test_fpmath(CXX)
         CXXFLAGS = '%s %s' % (CXXFLAGS, FPMATH_FLAGS)
@@ -2699,7 +2699,7 @@ def mk_config():
         config.write('CC=%s\n' % CC)
         config.write('CXX=%s\n' % CXX)
         config.write('CXXFLAGS=%s %s\n' % (CPPFLAGS, CXXFLAGS))
-        config.write('CFLAGS=%s %s\n' % (CPPFLAGS, CXXFLAGS.replace('-std=c++17', '')))
+        config.write('CFLAGS=%s %s\n' % (CPPFLAGS, CXXFLAGS.replace('-std=C++20', '')))
         config.write('EXAMP_DEBUG_FLAG=%s\n' % EXAMP_DEBUG_FLAG)
         config.write('CXX_OUT_FLAG=-o \n')
         config.write('C_OUT_FLAG=-o \n')
diff --git a/src/ast/converters/generic_model_converter.cpp b/src/ast/converters/generic_model_converter.cpp
index f64e798b5..03624c9de 100644
--- a/src/ast/converters/generic_model_converter.cpp
+++ b/src/ast/converters/generic_model_converter.cpp
@@ -156,7 +156,6 @@ void generic_model_converter::convert_initialize_value(expr* def, unsigned i, ve
     // el = value => c = false
     expr* c = nullptr, *th = nullptr, *el = nullptr;
     auto& [var, value] = var2value[i];
-    verbose_stream() << "def " << mk_pp(def, m) << "\n";
     if (m.is_ite(def, c, th, el)) {
         if (value == th) {
             var = c;
@@ -175,13 +174,7 @@ void generic_model_converter::convert_initialize_value(expr* def, unsigned i, ve
     if (is_uninterp(def)) {
         var = def;
         return;
-    }
-
-    bv_util bv(m);
-    if (bv.is_mkbv(def)) {
-        verbose_stream() << "def\n";
-    }
-    
+    }    
 
 }