diff --git a/Source/Project64/N64 System/Mips/System Events.cpp b/Source/Project64/N64 System/Mips/System Events.cpp
index f8793179a..0d6f930e5 100644
--- a/Source/Project64/N64 System/Mips/System Events.cpp	
+++ b/Source/Project64/N64 System/Mips/System Events.cpp	
@@ -215,8 +215,6 @@ void CSystemEvents::ChangePluginFunc ( void )
 	{
 		_Notify->DisplayMessage(5,MSG_PLUGIN_NOT_INIT);
 		_BaseSystem->m_EndEmulation = true;
-	} else {
-		//CC_Core::SetCurrentSystem(_N64System);
 	}
 	_Recompiler->ResetRecompCode();
 }
diff --git a/Source/Project64/N64 System/Mips/System Timing.h b/Source/Project64/N64 System/Mips/System Timing.h
index aef75a7fd..4c8f25c1a 100644
--- a/Source/Project64/N64 System/Mips/System Timing.h	
+++ b/Source/Project64/N64 System/Mips/System Timing.h	
@@ -1,7 +1,5 @@
 #include "..\\N64 Types.h"
 
-class CC_Core;
-
 class CSystemTimer : 
 	protected CGameSettings
 {
diff --git a/Source/Project64/N64 System/Mips/TLB Class.h b/Source/Project64/N64 System/Mips/TLB Class.h
index 1548c1ccf..649c909b4 100644
--- a/Source/Project64/N64 System/Mips/TLB Class.h	
+++ b/Source/Project64/N64 System/Mips/TLB Class.h	
@@ -108,7 +108,6 @@ private:
 		bool  Probed;
 	} FASTTLB; 
 
-	//friend CC_Core;
 	friend CDebugTlb; // enable debug window to read class
 
 	CTLB_CB * const m_CB;
diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp
index a953d38fa..faa02228c 100644
--- a/Source/Project64/N64 System/N64 Class.cpp	
+++ b/Source/Project64/N64 System/N64 Class.cpp	
@@ -871,12 +871,10 @@ void CN64System::UpdateSyncCPU (CN64System * const SecondCPU, DWORD const Cycles
 	if (CyclesToExecute < 0) { return; }
 	
 	SecondCPU->SetActiveSystem(true);
-	//CC_Core::SetCurrentSystem(SecondCPU);
 	
 	CInterpreterCPU::ExecuteOps(Cycles);
 
 	SetActiveSystem(true);
-	//CC_Core::SetCurrentSystem(this);
 }
 
 void CN64System::SyncCPUPC (CN64System * const SecondCPU) 
diff --git a/Source/Project64/N64 System/N64 Class.h b/Source/Project64/N64 System/N64 Class.h
index 643fb543f..45e22bf7b 100644
--- a/Source/Project64/N64 System/N64 Class.h	
+++ b/Source/Project64/N64 System/N64 Class.h	
@@ -13,7 +13,6 @@ typedef std::map<DWORD, DWORD> FUNC_CALLS;
 
 class CPlugins;
 class CRSP_Plugin;
-class CC_Core;
 
 //#define TEST_SP_TRACKING  //track the SP to make sure all ops pick it up fine
 
@@ -79,7 +78,6 @@ private:
 	friend CControl_Plugin;
 	
 	//Recompiler has access to manipulate and call functions
-	friend CC_Core;
 	friend CSystemTimer;
 
 	//Used for loading and potentialy executing the CPU in its own thread.