diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp
index a86bc21b523c..e9fbea956d63 100644
--- a/Core/CoreTiming.cpp
+++ b/Core/CoreTiming.cpp
@@ -363,11 +363,6 @@ void RemoveEvent(int event_type)
 	}
 }
 
-void RemoveAllEvents(int event_type)
-{
-	RemoveEvent(event_type);
-}
-
 void ProcessEvents() {
 	while (first) {
 		if (first->time <= (s64)GetTicks()) {
@@ -482,8 +477,7 @@ std::string GetScheduledEventsSummary() {
 	return text;
 }
 
-void Event_DoState(PointerWrap &p, BaseEvent *ev)
-{
+void Event_DoState(PointerWrap &p, BaseEvent *ev) {
 	// There may be padding, so do each one individually.
 	Do(p, ev->time);
 	Do(p, ev->userdata);
@@ -491,8 +485,7 @@ void Event_DoState(PointerWrap &p, BaseEvent *ev)
 	usedEventTypes.insert(ev->type);
 }
 
-void Event_DoStateOld(PointerWrap &p, BaseEvent *ev)
-{
+void Event_DoStateOld(PointerWrap &p, BaseEvent *ev) {
 	Do(p, *ev);
 	usedEventTypes.insert(ev->type);
 }
@@ -521,10 +514,11 @@ void DoState(PointerWrap &p) {
 	restoredEventTypes.clear();
 
 	if (s >= 3) {
-		DoLinkedList<BaseEvent, GetNewEvent, FreeEvent, Event_DoState>(p, first, (Event **) NULL);
+		DoLinkedList<BaseEvent, GetNewEvent, FreeEvent, Event_DoState>(p, first, (Event **)nullptr);
+		// This is here because we previously stored a second queue of "threadsafe" events. Gone now. Remove in the next section version upgrade.
 		DoIgnoreUnusedLinkedList(p);
 	} else {
-		DoLinkedList<BaseEvent, GetNewEvent, FreeEvent, Event_DoStateOld>(p, first, (Event **) NULL);
+		DoLinkedList<BaseEvent, GetNewEvent, FreeEvent, Event_DoStateOld>(p, first, (Event **)nullptr);
 		DoIgnoreUnusedLinkedList(p);
 	}
 
diff --git a/Core/CoreTiming.h b/Core/CoreTiming.h
index 32c86cfc3c85..a520672976b8 100644
--- a/Core/CoreTiming.h
+++ b/Core/CoreTiming.h
@@ -95,10 +95,8 @@ namespace CoreTiming
 	s64 UnscheduleEvent(int event_type, u64 userdata);
 
 	void RemoveEvent(int event_type);
-	void RemoveAllEvents(int event_type);
 	bool IsScheduled(int event_type);
 	void Advance();
-	void ProcessFifoWaitEvents();
 	void ForceCheck();
 
 	// Pretend that the main CPU has executed enough cycles to reach the next event.
diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp
index cffc283707b3..0257ee71ed9a 100644
--- a/Core/HLE/sceUmd.cpp
+++ b/Core/HLE/sceUmd.cpp
@@ -179,7 +179,7 @@ static void __KernelUmdActivate()
 		__KernelNotifyCallback(driveCBId, notifyArg);
 
 	// Don't activate immediately, take time to "spin up."
-	CoreTiming::RemoveAllEvents(umdStatChangeEvent);
+	CoreTiming::RemoveEvent(umdStatChangeEvent);
 	CoreTiming::ScheduleEvent(usToCycles(MICRO_DELAY_ACTIVATE), umdStatChangeEvent, 1);
 }
 
@@ -189,7 +189,7 @@ static void __KernelUmdDeactivate()
 	if (driveCBId != 0)
 		__KernelNotifyCallback(driveCBId, notifyArg);
 
-	CoreTiming::RemoveAllEvents(umdStatChangeEvent);
+	CoreTiming::RemoveEvent(umdStatChangeEvent);
 	__UmdStatChange(0, 0);
 }