diff --git a/core/cfg/option.cpp b/core/cfg/option.cpp
index d8291ebff..e2f21e85c 100644
--- a/core/cfg/option.cpp
+++ b/core/cfg/option.cpp
@@ -24,7 +24,6 @@ namespace config {
 
 Option<bool> DynarecEnabled("Dynarec.Enabled", true);
 Option<bool> DynarecIdleSkip("Dynarec.idleskip", true);
-Option<bool> DynarecSafeMode("Dynarec.safe-mode");
 
 // General
 
diff --git a/core/cfg/option.h b/core/cfg/option.h
index a8dd399e8..65e9bc3a2 100644
--- a/core/cfg/option.h
+++ b/core/cfg/option.h
@@ -346,7 +346,7 @@ using OptionString = Option<std::string>;
 
 extern Option<bool> DynarecEnabled;
 extern Option<bool> DynarecIdleSkip;
-extern Option<bool> DynarecSafeMode;
+constexpr bool DynarecSafeMode = false;
 
 // General
 
diff --git a/core/rend/TexCache.cpp b/core/rend/TexCache.cpp
index fcdf3196c..d9429343e 100644
--- a/core/rend/TexCache.cpp
+++ b/core/rend/TexCache.cpp
@@ -236,7 +236,7 @@ void libCore_vramlock_Lock(u32 start_offset64, u32 end_offset64, BaseTextureCach
 			texture->lock_block = block;
 		}
 		else
-			free(block);
+			delete block;
 	}
 }
 
@@ -285,7 +285,7 @@ bool VramLockedWrite(u8* address)
 static void libCore_vramlock_Unlock_block_wb(vram_block* block)
 {
 	vramlock_list_remove(block);
-	free(block);
+	delete block;
 }
 
 #ifndef TARGET_NO_OPENMP
diff --git a/core/rend/gui.cpp b/core/rend/gui.cpp
index e8d689959..818396117 100644
--- a/core/rend/gui.cpp
+++ b/core/rend/gui.cpp
@@ -1841,8 +1841,6 @@ static void gui_display_settings()
 		    {
 		    	ImGui::Spacing();
 		    	header("Dynarec Options");
-		    	OptionCheckbox("Safe Mode", config::DynarecSafeMode,
-		    			"Do not optimize integer division. Not recommended");
 		    	OptionCheckbox("Idle Skip", config::DynarecIdleSkip, "Skip wait loops. Recommended");
 		    }
 	    	ImGui::Spacing();
diff --git a/shell/libretro/libretro_core_options.h b/shell/libretro/libretro_core_options.h
index 1e46d41c1..6b2a7d2c0 100644
--- a/shell/libretro/libretro_core_options.h
+++ b/shell/libretro/libretro_core_options.h
@@ -425,17 +425,6 @@ struct retro_core_option_definition option_defs_us[] = {
       },
       "Default",
    },
-   {
-      CORE_OPTION_NAME "_div_matching",
-      "DIV Matching",
-      "Optimize integer division",
-      {
-         { "auto",     "Auto" },
-         { "disabled", NULL },
-         { NULL, NULL },
-      },
-      "auto",
-   },
    {
       CORE_OPTION_NAME "_force_wince",
       "Force Windows CE Mode",
diff --git a/shell/libretro/libretro_core_options_intl.h b/shell/libretro/libretro_core_options_intl.h
index 41b7f1cbd..6d835d3d4 100644
--- a/shell/libretro/libretro_core_options_intl.h
+++ b/shell/libretro/libretro_core_options_intl.h
@@ -371,17 +371,6 @@ struct retro_core_option_definition option_defs_tr[] = {
       },
       NULL,
    },
-   {
-      CORE_OPTION_NAME "_div_matching",
-      "DIV Eşleştirme (performans, daha az doğru)",
-      "",
-      {
-         { "auto",     "Otomatik" },
-         { "disabled", NULL },
-         { NULL, NULL },
-      },
-      NULL,
-   },
    {
       CORE_OPTION_NAME "_force_wince",
       "Force Windows CE Mode",
diff --git a/shell/libretro/option.cpp b/shell/libretro/option.cpp
index d1bd3b47d..a5d8363b1 100644
--- a/shell/libretro/option.cpp
+++ b/shell/libretro/option.cpp
@@ -25,7 +25,6 @@ namespace config {
 
 Option<bool> DynarecEnabled("", true);
 Option<bool> DynarecIdleSkip("", true);
-Option<bool> DynarecSafeMode(CORE_OPTION_NAME "_div_matching");
 
 // General