diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
index 4149931353..620d6c7052 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
@@ -405,7 +405,6 @@ void ExecuteCommand(u32 _Address)
 				else
 				{
 					delete pDevice;
-					pDevice = NULL;
 				}
 			}
 
@@ -436,10 +435,7 @@ void ExecuteCommand(u32 _Address)
 
 			// Don't delete hardware
 			if (!pDevice->IsHardware())
-			{
 				delete pDevice;
-				pDevice = NULL;
-			}
 		}
 		else
 		{
@@ -519,8 +515,8 @@ void ExecuteCommand(u32 _Address)
     if (CmdSuccess)
     {
 		// Generate a reply to the IPC command
-		int const reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0;
-		EnqReply(_Address, reply_delay);
+		// TODO: should probably figure out which commands need delayed replies and which don't
+		EnqReply(_Address, SystemTimers::GetTicksPerSecond() / 100);
     }
 	else
 	{
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h
index d52bd4f1e3..d2907d7ee9 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device.h
@@ -95,8 +95,6 @@ public:
 	virtual bool IOCtlV	(u32) { UNIMPLEMENTED_CMD(IOCtlV) }
 #undef UNIMPLEMENTED_CMD
 
-	virtual int GetCmdDelay(u32) { return 0; }
-
 	virtual u32 Update() { return 0; }
 
 	virtual bool IsHardware() { return m_Hardware; }
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
index 18ddc56c88..05b365ef01 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
@@ -28,7 +28,6 @@
 #include "VolumeCreator.h"
 #include "Filesystem.h"
 #include "LogManager.h"
-#include "../HW/SystemTimers.h"
 
 #include "../../DiscIO/Src/FileMonitor.h"
 
@@ -461,8 +460,3 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
     // i dunno but prolly 1 is okay all the time :)
     return 1;
 }
-
-int CWII_IPC_HLE_Device_di::GetCmdDelay(u32)
-{
-	return SystemTimers::GetTicksPerSecond() / 100;
-}
\ No newline at end of file
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h
index 0b62daefa3..36e9f89067 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.h
@@ -38,8 +38,6 @@ public:
 
 	bool IOCtl(u32 _CommandAddress); 
 	bool IOCtlV(u32 _CommandAddress);
-	
-	int GetCmdDelay(u32);
 
 private: