diff --git a/src/base/base_entry_point.c b/src/base/base_entry_point.c
index ce2de7d7..d17dd15b 100644
--- a/src/base/base_entry_point.c
+++ b/src/base/base_entry_point.c
@@ -68,7 +68,7 @@ main_thread_base_entry_point(int arguments_count, char **arguments)
 #if defined(MUTABLE_TEXT_H) && !defined(MTX_INIT_MANUAL)
   mtx_init();
 #endif
-#if defined(DBGI_H) && !defined(DI_INIT_MANUAL)
+#if defined(DBG_INFO_H) && !defined(DI_INIT_MANUAL)
   di_init();
 #endif
 #if defined(DEMON_CORE_H) && !defined(DMN_INIT_MANUAL)
diff --git a/src/dbgi/dbgi.c b/src/dbg_info/dbg_info.c
similarity index 100%
rename from src/dbgi/dbgi.c
rename to src/dbg_info/dbg_info.c
diff --git a/src/dbgi/dbgi.h b/src/dbg_info/dbg_info.h
similarity index 95%
rename from src/dbgi/dbgi.h
rename to src/dbg_info/dbg_info.h
index 10f59b27..22e4d8eb 100644
--- a/src/dbgi/dbgi.h
+++ b/src/dbg_info/dbg_info.h
@@ -1,8 +1,8 @@
 // Copyright (c) Epic Games Tools
 // Licensed under the MIT license (https://opensource.org/license/mit/)
 
-#ifndef DBGI_H
-#define DBGI_H
+#ifndef DBG_INFO_H
+#define DBG_INFO_H
 
 ////////////////////////////////
 //~ rjf: Cache Key Type
@@ -486,4 +486,4 @@ internal void di_match_store_begin(DI_MatchStore *store, DI_KeyArray keys);
 internal DI_Match di_match_from_name(DI_MatchStore *store, String8 name, U64 endt_us);
 ASYNC_WORK_DEF(di_match_work);
 
-#endif // DBGI_H
+#endif // DBG_INFO_H
diff --git a/src/raddbg/raddbg_main.c b/src/raddbg/raddbg_main.c
index 34a1b71f..a835cc51 100644
--- a/src/raddbg/raddbg_main.c
+++ b/src/raddbg/raddbg_main.c
@@ -248,7 +248,7 @@
 #include "radbin/radbin.h"
 #include "regs/regs.h"
 #include "regs/rdi/regs_rdi.h"
-#include "dbgi/dbgi.h"
+#include "dbg_info/dbg_info.h"
 #include "disasm/disasm.h"
 #include "demon/demon_inc.h"
 #include "eval/eval_inc.h"
@@ -256,7 +256,6 @@
 #include "ctrl/ctrl_inc.h"
 #include "font_provider/font_provider_inc.h"
 #include "render/render_inc.h"
-#include "ptr_graph_cache/ptr_graph_cache.h"
 #include "font_cache/font_cache.h"
 #include "draw/draw.h"
 #include "ui/ui_inc.h"
@@ -296,7 +295,7 @@
 #include "radbin/radbin.c"
 #include "regs/regs.c"
 #include "regs/rdi/regs_rdi.c"
-#include "dbgi/dbgi.c"
+#include "dbg_info/dbg_info.c"
 #include "disasm/disasm.c"
 #include "demon/demon_inc.c"
 #include "eval/eval_inc.c"
@@ -304,7 +303,6 @@
 #include "ctrl/ctrl_inc.c"
 #include "font_provider/font_provider_inc.c"
 #include "render/render_inc.c"
-#include "ptr_graph_cache/ptr_graph_cache.c"
 #include "font_cache/font_cache.c"
 #include "draw/draw.c"
 #include "ui/ui_inc.c"
diff --git a/src/scratch/convertperf.c b/src/scratch/convertperf.c
deleted file mode 100644
index 3043f1c2..00000000
--- a/src/scratch/convertperf.c
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) Epic Games Tools
-// Licensed under the MIT license (https://opensource.org/license/mit/)
-
-////////////////////////////////
-//~ rjf: Build Options
-
-#define BUILD_TITLE "convertperf"
-
-////////////////////////////////
-//~ rjf: Includes
-
-//- rjf: [lib]
-#include "third_party/rad_lzb_simple/rad_lzb_simple.h"
-#include "third_party/rad_lzb_simple/rad_lzb_simple.c"
-
-//- rjf: [h]
-#include "base/base_inc.h"
-#include "os/os_inc.h"
-#include "async/async.h"
-#include "rdi_format/rdi_format_local.h"
-#include "dbgi/dbgi.h"
-
-//- rjf: [c]
-#include "base/base_inc.c"
-#include "os/os_inc.c"
-#include "async/async.c"
-#include "rdi_format/rdi_format_local.c"
-#include "dbgi/dbgi.c"
-
-////////////////////////////////
-//~ rjf: Entry Points
-
-internal void
-entry_point(CmdLine *cmdline)
-{
-  Arena *arena = arena_alloc();
-  String8 list_path = str8_list_first(&cmdline->inputs);
-  String8 list_data = os_data_from_file_path(arena, list_path);
-  U8 splits[] = {'\n'};
-  String8List lines = str8_split(arena, list_data, splits, ArrayCount(splits), 0);
-  OS_HandleList processes = {0};
-  String8Node *processes_first_path_n = 0;
-  U64 limit = 64;
-  U64 idx = 0;
-  for(String8Node *n = lines.first; n != 0; n = n->next)
-  {
-    String8 dll_path = n->string;
-    ProfScope("kick off %.*s", str8_varg(dll_path))
-    {
-      String8 dll_path_no_ext = str8_chop_last_dot(dll_path);
-      String8 dll_name = str8_skip_last_slash(dll_path_no_ext);
-      String8 pdb_path = push_str8f(arena, "%S.pdb", dll_path_no_ext);
-      String8 rdi_path = push_str8f(arena, "dump/%S.rdi", dll_name);
-      OS_Handle handle = os_cmd_line_launchf("raddbg --bin %S --out:%S", pdb_path, rdi_path);
-      os_handle_list_push(arena, &processes, handle);
-      if(processes_first_path_n == 0)
-      {
-        processes_first_path_n = n;
-      }
-      idx += 1;
-    }
-    if(idx >= limit)
-    {
-      String8Node *line_n = processes_first_path_n;
-      for(OS_HandleNode *n = processes.first; n != 0; n = n->next, line_n = line_n->next)
-      {
-        ProfScope("join %.*s", str8_varg(line_n->string))
-        {
-          os_process_join(n->v, max_U64);
-        }
-      }
-      idx = 0;
-      MemoryZeroStruct(&processes);
-      processes_first_path_n = 0;
-    }
-  }
-}