diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
index c0ae97711b6..d9a63868899 100644
--- a/src/emu/debug/debugcpu.cpp
+++ b/src/emu/debug/debugcpu.cpp
@@ -55,7 +55,7 @@ debugger_cpu::debugger_cpu(running_machine &machine)
 	m_tempvar = make_unique_clear<UINT64[]>(NUM_TEMP_VARIABLES);
 
 	/* create a global symbol table */
-	m_symtable = global_alloc(symbol_table(&m_machine));
+	m_symtable = std::make_unique<symbol_table>(&m_machine);
 
 	// configure our base memory accessors
 	configure_memory(*m_symtable);
@@ -84,8 +84,6 @@ debugger_cpu::debugger_cpu(running_machine &machine)
 	/* add callback for breaking on VBLANK */
 	if (m_machine.first_screen() != nullptr)
 		m_machine.first_screen()->register_vblank_callback(vblank_state_delegate(FUNC(debugger_cpu::on_vblank), this));
-
-	machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(debugger_cpu::exit), this));
 }
 
 void debugger_cpu::configure_memory(symbol_table &table)
@@ -163,7 +161,7 @@ bool debugger_cpu::is_stopped()
 
 symbol_table* debugger_cpu::get_global_symtable()
 {
-	return m_symtable;
+	return m_symtable.get();
 }
 
 
@@ -956,16 +954,6 @@ UINT64 debugger_cpu::read_opcode(address_space &space, offs_t address, int size)
     INTERNAL HELPERS
 ***************************************************************************/
 
-/*-------------------------------------------------
-    exit - free all memory
--------------------------------------------------*/
-
-void debugger_cpu::exit()
-{
-	global_free(m_symtable);
-}
-
-
 /*-------------------------------------------------
     on_vblank - called when a VBLANK hits
 -------------------------------------------------*/
diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
index 2acfba9ea67..af8cb57a2e4 100644
--- a/src/emu/debug/debugcpu.h
+++ b/src/emu/debug/debugcpu.h
@@ -606,7 +606,6 @@ private:
 	UINT64 get_frame(symbol_table &table, void *ref);
 
 	/* internal helpers */
-	void exit();
 	void on_vblank(screen_device &device, bool vblank_state);
 
 	running_machine&	m_machine;
@@ -617,7 +616,7 @@ private:
 
 	FILE *		m_source_file;			// script source file
 
-	symbol_table *	m_symtable;			// global symbol table
+	std::unique_ptr<symbol_table> m_symtable;			// global symbol table
 
 	bool	m_within_instruction_hook;
 	bool	m_vblank_occurred;
diff --git a/src/emu/debug/debugvw.cpp b/src/emu/debug/debugvw.cpp
index 09842dc349e..bfeec537118 100644
--- a/src/emu/debug/debugvw.cpp
+++ b/src/emu/debug/debugvw.cpp
@@ -355,12 +355,6 @@ debug_view *debug_view_manager::alloc_view(debug_view_type type, debug_view_osd_
 		case DVT_LOG:
 			return append(global_alloc(debug_view_log(machine(), osdupdate, osdprivate)));
 
-		case DVT_TIMERS:
-//          return append(global_alloc(debug_view_timers(machine(), osdupdate, osdprivate)));
-
-		case DVT_ALLOCS:
-//          return append(global_alloc(debug_view_allocs(machine(), osdupdate, osdprivate)));
-
 		case DVT_BREAK_POINTS:
 			return append(global_alloc(debug_view_breakpoints(machine(), osdupdate, osdprivate)));
 
diff --git a/src/emu/debug/debugvw.h b/src/emu/debug/debugvw.h
index cb1852aed2c..2f5d8c16872 100644
--- a/src/emu/debug/debugvw.h
+++ b/src/emu/debug/debugvw.h
@@ -27,8 +27,6 @@ enum debug_view_type
 	DVT_DISASSEMBLY,
 	DVT_MEMORY,
 	DVT_LOG,
-	DVT_TIMERS,
-	DVT_ALLOCS,
 	DVT_BREAK_POINTS,
 	DVT_WATCH_POINTS
 };