diff --git a/source/CardManager.cpp b/source/CardManager.cpp
index 236d4ca0..da05c99d 100644
--- a/source/CardManager.cpp
+++ b/source/CardManager.cpp
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "CardManager.h"
-#include "Core.h"
 #include "Registry.h"
 
 #include "Disk.h"
@@ -251,8 +250,7 @@ void CardManager::Destroy()
 		}
 	}
 
-	GetCardMgr().GetDisk2CardMgr().Destroy();
-	GetCardMgr().GetMockingboardCardMgr().Destroy();
+	GetMockingboardCardMgr().Destroy();
 }
 
 void CardManager::Reset(const bool powerCycle)
@@ -265,7 +263,7 @@ void CardManager::Reset(const bool powerCycle)
 		}
 	}
 
-	GetCardMgr().GetMockingboardCardMgr().Reset(powerCycle);
+	GetMockingboardCardMgr().Reset(powerCycle);
 }
 
 void CardManager::Update(const ULONG nExecutedCycles)
@@ -278,7 +276,7 @@ void CardManager::Update(const ULONG nExecutedCycles)
 		}
 	}
 
-	GetCardMgr().GetMockingboardCardMgr().Update(nExecutedCycles);
+	GetMockingboardCardMgr().Update(nExecutedCycles);
 }
 
 void CardManager::SaveSnapshot(YamlSaveHelper& yamlSaveHelper)
diff --git a/source/Disk2CardManager.cpp b/source/Disk2CardManager.cpp
index b0dd10ad..42e4b995 100644
--- a/source/Disk2CardManager.cpp
+++ b/source/Disk2CardManager.cpp
@@ -106,13 +106,6 @@ void Disk2CardManager::LoadLastDiskImage(void)
 	}
 }
 
-// Called by CardManager::Destroy()
-void Disk2CardManager::Destroy(void)
-{
-	// NB. All cards (including any Disk2 cards) have just been destroyed by CardManager
-	// - so nothing to do
-}
-
 bool Disk2CardManager::IsAnyFirmware13Sector(void)
 {
 	for (UINT i = 0; i < NUM_SLOTS; i++)
diff --git a/source/Disk2CardManager.h b/source/Disk2CardManager.h
index cff26710..09d370c5 100644
--- a/source/Disk2CardManager.h
+++ b/source/Disk2CardManager.h
@@ -12,7 +12,6 @@ public:
 	bool GetEnhanceDisk(void);
 	void SetEnhanceDisk(bool enhanceDisk);
 	void LoadLastDiskImage(void);
-	void Destroy(void);
 	bool IsAnyFirmware13Sector(void);
 	void GetFilenameAndPathForSaveState(std::string& filename, std::string& path);
 	void SetStepperDefer(bool defer);