diff --git a/Common/Log/LogManager.h b/Common/Log/LogManager.h
index ba458b3af6..5e53199e3a 100644
--- a/Common/Log/LogManager.h
+++ b/Common/Log/LogManager.h
@@ -93,10 +93,6 @@ private:
 	bool enabled_ = false;
 };
 
-// TODO: A simple buffered log that can be used to display the log in-window
-// on Android etc.
-// class BufferedLogListener { ... }
-
 struct LogChannel {
 	char m_shortName[32]{};
 	LogLevel level;
diff --git a/Core/Core.cpp b/Core/Core.cpp
index dffe878177..9fe9b44df7 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -149,13 +149,6 @@ void Core_WaitInactive() {
 	}
 }
 
-void Core_WaitInactive(int milliseconds) {
-	if (Core_IsActive() && !GPUStepping::IsStepping()) {
-		std::unique_lock<std::mutex> guard(m_hInactiveMutex);
-		m_InactiveCond.wait_for(guard, std::chrono::milliseconds(milliseconds));
-	}
-}
-
 void Core_SetPowerSaving(bool mode) {
 	powerSaving = mode;
 }
diff --git a/Core/Core.h b/Core/Core.h
index 574fea3b22..fe55c31f1b 100644
--- a/Core/Core.h
+++ b/Core/Core.h
@@ -96,7 +96,6 @@ bool Core_IsInactive();
 // Warning: these three are only used on Windows - debugger integration.
 void Core_StateProcessed();
 void Core_WaitInactive();
-void Core_WaitInactive(int milliseconds);
 
 void Core_SetPowerSaving(bool mode);
 bool Core_GetPowerSaving();
diff --git a/Core/Debugger/Breakpoints.cpp b/Core/Debugger/Breakpoints.cpp
index 810643f6b9..d26d5e7f2f 100644
--- a/Core/Debugger/Breakpoints.cpp
+++ b/Core/Debugger/Breakpoints.cpp
@@ -626,7 +626,7 @@ void BreakpointManager::Update(u32 addr) {
 		bool resume = false;
 		if (Core_IsStepping() == false) {
 			Core_Break("cpu.breakpoint.update", addr);
-			Core_WaitInactive(200);
+			Core_WaitInactive();
 			resume = true;
 		}
 
diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp
index 11b2972e1e..78dcedb2c0 100644
--- a/Windows/Debugger/Debugger_Disasm.cpp
+++ b/Windows/Debugger/Debugger_Disasm.cpp
@@ -302,7 +302,7 @@ BOOL CDisasm::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) {
 					if (isRunning)
 					{
 						Core_Break("cpu.breakpoint.add", 0);
-						Core_WaitInactive(200);
+						Core_WaitInactive();
 					}
 
 					BreakpointWindow bpw(m_hDlg,cpu);
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index e3a5868a90..4f0c1924c1 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -353,7 +353,7 @@ void MainThreadFunc() {
 		// Process the shutdown.  Without this, non-GL delays 800ms on shutdown.
 		Core_Run(g_graphicsContext);
 	}
-	Core_WaitInactive(800);
+	Core_WaitInactive();
 
 	g_inLoop = false;