diff --git a/Data/Sys/Maps/GFZE01.map b/Data/Sys/Maps/GFZE01.map
deleted file mode 100644
index 464dba3610..0000000000
--- a/Data/Sys/Maps/GFZE01.map
+++ /dev/null
@@ -1,41 +0,0 @@
-.text
-80003488 000000b8 80003488 0 __fill_mem
-80003540 00000050 80003540 0 memcpy
-8006cff8 0000004c 8006cff8 0 .LoadQuantizers
-8006d044 0000002c 8006d044 0 .kill_infinites_helper
-8006d070 00000018 8006d070 0 .kill_infinites
-8006d088 0000002c 8006d088 0 .rsqrt
-8006d0b4 00000034 8006d0b4 0 .sqrt_internal_fz
-8006d0e8 00000030 8006d0e8 0 .rsqrt_internal_fz
-8006d118 00000070 8006d118 0 .sqrt_fz
-8006d188 00000030 8006d188 0 .wrapping_once_fp_lookup
-8006d1b8 00000064 8006d1b8 0 .weird2
-8006d1c4 00000058 8006d1c4 0 .into_weird2
-8006d21c 00000030 8006d21c 0 .lookup_some_float_in_table_with_neg_wrap
-8006d24c 00000184 8006d24c 0 .atan2
-8006d3d0 0000009c 8006d3d0 0 .asin_fz
-8006d46c 000000c8 8006d46c 0 .acos_fz
-8006d534 00000070 8006d534 0 .evil_vec_cosine
-8006d5f0 00000078 8006d5f0 0 .evil_vec_setlength
-8006d668 00000094 8006d668 0 .evil_vec_something
-8006d6fc 0000005c 8006d6fc 0 .func
-8006d784 0000002c 8006d784 0 .load_strange_matrix1
-8006d7b0 0000002c 8006d7b0 0 .load_strange_matrix2
-8006d7f4 0000003c 8006d7f4 0 .some_strange_destination
-8006db30 00000044 8006db30 0 .push_matrix_3x3?
-8006db74 00000038 8006db74 0 .write_top_3x3_matrix
-8006dbe4 0000003c 8006dbe4 0 .read_current_3x3_matrix
-8006dc20 00000014 8006dc20 0 .pop_matrix_stack
-8006e424 00000074 8006e424 0 .weird_param_in_p1_p2
-8006e978 000001d4 8006e978 0 zz_006e978_
-8006eb4c 000001c0 8006eb4c 0 zz_006eb4c_
-8006f6a8 000000cc 8006f6a8 0 .z_last_skum_function
-800798f0 000000ec 800798f0 0 __div2u
-800799dc 00000138 800799dc 0 __div2i
-80079b14 000000e0 80079b14 0 __mod2u
-80079bf8 0000010c 80079bf8 0 __mod2i
-80079d04 00000024 80079d04 0 __shl2i
-80079d28 00000024 80079d28 0 __shr2u
-80079d4c 00000028 80079d4c 0 __shr2i
-8008596c 00000310 8008596c 0 big_matrix_trickery
-80088538 00000020 80088538 0 zz_0088538_
diff --git a/Data/Sys/Maps/GMBE8P.map b/Data/Sys/Maps/GMBE8P.map
deleted file mode 100644
index 7cbab7e984..0000000000
--- a/Data/Sys/Maps/GMBE8P.map
+++ /dev/null
@@ -1,34 +0,0 @@
-.text
-800031f0 0000001c 800031f0 0 load_sp_rtoc
-80007034 0000004c 80007034 0 .LoadQuantizers
-80007080 00000030 80007080 0 .LoadInfinitiesEtc
-800070b0 00000038 800070b0 0 .rsqrt
-800070ec 00000040 800070ec 0 .sqrt_internal_needs_cr1
-8000712c 00000040 8000712c 0 .rsqrt_internal_needs_cr1
-800071e0 00000030 800071e0 0 .wrapping_once_fp_lookup
-80007210 00000064 80007210 0 .weird2
-80007274 00000030 80007274 0 .lookup_some_float_in_table_with_neg_wrap
-800072a4 00000180 800072a4 0 .atan2
-80007424 000000b8 80007424 0 .calls_sqrt
-800074dc 0000005c 800074dc 0 .func
-80007538 0000002c 80007538 0 .load_strange_matrix1
-80007564 0000002c 80007564 0 .load_strange_matrix3
-80007590 0000002c 80007590 0 .load_strange_matrix2
-80007834 00000044 80007834 0 .push_matrix_3x3?
-80007878 00000038 80007878 0 .read_top_3x3matrix
-800078b0 00000038 800078b0 0 .write_top_3x3_matrix
-800078e8 0000003c 800078e8 0 .read_current_3x3_matrix
-80007924 00000014 80007924 0 .pop_matrix_stack
-80007a50 00000170 80007a50 0 .mult_matrix?
-80007ecc 000000bc 80007ecc 0 .weird_vector_op_status_in_cr2
-80007f88 00000074 80007f88 0 .weird_param_in_p1_p2
-800080fc 00000078 800080fc 0 .evil_normalize
-80008174 00000078 80008174 0 .evil_vec_setlength
-800081ec 00000070 800081ec 0 .evil_vec_cosine
-80008538 000000f0 80008538 0 .calls_evil1
-8000875c 00000088 8000875c 0 .another_caller
-800087e4 0000008c 800087e4 0 .another_caller2
-80008d30 000001b4 80008d30 0 .another_caller3
-80036544 000001b4 80036544 0 .fctiwi_weird2
-8003dd1c 00000110 8003dd1c 0 .fctwi_weird
-80043b48 000005bc 80043b48 0 .fctwi_weird3
diff --git a/Readme.md b/Readme.md
index 5ec9acee9d..80f0f1424f 100644
--- a/Readme.md
+++ b/Readme.md
@@ -200,7 +200,6 @@ These folders are installed read-only and should not be changed:
 
 * `GameSettings`: per-game default settings database
 * `GC`: DSP and font dumps
-* `Maps`: symbol tables (dev only)
 * `Shaders`: post-processing shaders
 * `Themes`: icon themes for GUI
 * `Resources`: icons that are theme-agnostic
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index 30691c730f..0ad7f6ec12 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -362,24 +362,17 @@ void CBoot::UpdateDebugger_MapLoaded()
 bool CBoot::FindMapFile(std::string* existing_map_file, std::string* writable_map_file)
 {
   const std::string& game_id = SConfig::GetInstance().m_debugger_game_id;
+  std::string path = File::GetUserPath(D_MAPS_IDX) + game_id + ".map";
 
   if (writable_map_file)
-    *writable_map_file = File::GetUserPath(D_MAPS_IDX) + game_id + ".map";
+    *writable_map_file = path;
 
-  static const std::array<std::string, 2> maps_directories{
-      File::GetUserPath(D_MAPS_IDX),
-      File::GetSysDirectory() + MAPS_DIR DIR_SEP,
-  };
-  for (const auto& directory : maps_directories)
+  if (File::Exists(path))
   {
-    std::string path = directory + game_id + ".map";
-    if (File::Exists(path))
-    {
-      if (existing_map_file)
-        *existing_map_file = std::move(path);
+    if (existing_map_file)
+      *existing_map_file = std::move(path);
 
-      return true;
-    }
+    return true;
   }
 
   return false;