diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp
index cd471aae44..6e841d5fca 100644
--- a/Source/Core/VideoCommon/CommandProcessor.cpp
+++ b/Source/Core/VideoCommon/CommandProcessor.cpp
@@ -38,8 +38,6 @@ static u16 m_tokenReg;
 
 static std::atomic<bool> s_interrupt_set;
 static std::atomic<bool> s_interrupt_waiting;
-static std::atomic<bool> s_interrupt_token_waiting;
-static std::atomic<bool> s_interrupt_finish_waiting;
 
 static bool IsOnThread()
 {
@@ -65,8 +63,6 @@ void DoState(PointerWrap& p)
 
   p.Do(s_interrupt_set);
   p.Do(s_interrupt_waiting);
-  p.Do(s_interrupt_token_waiting);
-  p.Do(s_interrupt_finish_waiting);
 }
 
 static inline void WriteLow(volatile u32& _reg, u16 lowbits)
@@ -112,8 +108,6 @@ void Init()
 
   s_interrupt_set.store(false);
   s_interrupt_waiting.store(false);
-  s_interrupt_finish_waiting.store(false);
-  s_interrupt_token_waiting.store(false);
 
   et_UpdateInterrupts = CoreTiming::RegisterEvent("CPInterrupt", UpdateInterrupts_Wrapper);
 }
@@ -356,16 +350,6 @@ bool IsInterruptWaiting()
   return s_interrupt_waiting.load();
 }
 
-void SetInterruptTokenWaiting(bool waiting)
-{
-  s_interrupt_token_waiting.store(waiting);
-}
-
-void SetInterruptFinishWaiting(bool waiting)
-{
-  s_interrupt_finish_waiting.store(waiting);
-}
-
 void SetCPStatusFromGPU()
 {
   // breakpoint
diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp
index 3a223619c1..d7fd67c18f 100644
--- a/Source/Core/VideoCommon/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/PixelEngine.cpp
@@ -257,14 +257,12 @@ static void SetToken_OnMainThread(u64 userdata, s64 cyclesLate)
     s_signal_token_interrupt.store(1);
     UpdateInterrupts();
   }
-  CommandProcessor::SetInterruptTokenWaiting(false);
 }
 
 static void SetFinish_OnMainThread(u64 userdata, s64 cyclesLate)
 {
   s_signal_finish_interrupt.store(1);
   UpdateInterrupts();
-  CommandProcessor::SetInterruptFinishWaiting(false);
 
   Core::FrameUpdateOnCPUThread();
 }
@@ -278,8 +276,6 @@ void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
     s_signal_token_interrupt.store(1);
   }
 
-  CommandProcessor::SetInterruptTokenWaiting(true);
-
   if (!SConfig::GetInstance().bCPUThread || Fifo::UseDeterministicGPUThread())
     CoreTiming::ScheduleEvent(0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16));
   else
@@ -291,8 +287,6 @@ void SetToken(const u16 _token, const int _bSetTokenAcknowledge)
 // THIS IS EXECUTED FROM VIDEO THREAD (BPStructs.cpp) when a new frame has been drawn
 void SetFinish()
 {
-  CommandProcessor::SetInterruptFinishWaiting(true);
-
   if (!SConfig::GetInstance().bCPUThread || Fifo::UseDeterministicGPUThread())
     CoreTiming::ScheduleEvent(0, et_SetFinishOnMainThread, 0);
   else