diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index dadbd7242..8db8e5f21 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -49,21 +49,6 @@ Thread* GetCurrentThread() {
     return current_thread;
 }
 
-/// Sets the current thread
-inline void SetCurrentThread(Thread* t) {
-    current_thread = t;
-}
-
-/// Saves the current CPU context
-void SaveContext(Core::ThreadContext& ctx) {
-    Core::g_app_core->SaveContext(ctx);
-}
-
-/// Loads a CPU context
-void LoadContext(Core::ThreadContext& ctx) {
-    Core::g_app_core->LoadContext(ctx);
-}
-
 /// Resets a thread
 void ResetThread(Thread* t, u32 arg, s32 lowest_priority) {
     memset(&t->context, 0, sizeof(Core::ThreadContext));
@@ -203,7 +188,7 @@ void SwitchContext(Thread* t) {
 
     // Save context for current thread
     if (cur) {
-        SaveContext(cur->context);
+        Core::g_app_core->SaveContext(cur->context);
 
         if (cur->IsRunning()) {
             ChangeReadyState(cur, true);
@@ -211,13 +196,13 @@ void SwitchContext(Thread* t) {
     }
     // Load context of new thread
     if (t) {
-        SetCurrentThread(t);
+        current_thread = t;
         ChangeReadyState(t, false);
         t->status = (t->status | THREADSTATUS_RUNNING) & ~THREADSTATUS_READY;
         t->wait_type = WAITTYPE_NONE;
-        LoadContext(t->context);
+        Core::g_app_core->LoadContext(t->context);
     } else {
-        SetCurrentThread(nullptr);
+        current_thread = nullptr;
     }
 }
 
@@ -373,9 +358,9 @@ Thread* SetupMainThread(s32 priority, int stack_size) {
     }
 
     // Run new "main" thread
-    SetCurrentThread(thread);
+    current_thread = thread;
     thread->status = THREADSTATUS_RUNNING;
-    LoadContext(thread->context);
+    Core::g_app_core->LoadContext(thread->context);
 
     return thread;
 }