diff --git a/command_event.c b/command_event.c
index db67b3c680..1b3314283e 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1410,7 +1410,6 @@ bool event_command(enum event_command cmd)
          global->core_info.list = NULL;
          break;
       case EVENT_CMD_DATA_RUNLOOP_FREE:
-         rarch_main_data_free();
          break;
       case EVENT_CMD_CORE_INFO_INIT:
          event_command(EVENT_CMD_CORE_INFO_DEINIT);
@@ -1620,7 +1619,6 @@ bool event_command(enum event_command cmd)
       case EVENT_CMD_MSG_QUEUE_INIT:
          event_command(EVENT_CMD_MSG_QUEUE_DEINIT);
          rarch_main_msg_queue_init();
-         rarch_main_data_init_queues();
          break;
       case EVENT_CMD_BSV_MOVIE_DEINIT:
          if (!global)
diff --git a/griffin/griffin.c b/griffin/griffin.c
index f5805ae47c..8a95d84d4f 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -700,6 +700,7 @@ RETROARCH
 #include "../runloop_data.c"
 #include "../runloop_msg.c"
 #include "../system.c"
+#include "../tasks/tasks.c"
 
 #include "../msg_hash.c"
 #include "../intl/msg_hash_de.c"
diff --git a/retroarch.c b/retroarch.c
index 90609c28f0..4194e7b83b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1101,6 +1101,8 @@ void rarch_main_free(void)
 
    rarch_main_ctl(RARCH_MAIN_CTL_STATE_FREE,  NULL);
    rarch_main_ctl(RARCH_MAIN_CTL_GLOBAL_FREE, NULL);
+
+   rarch_main_data_deinit();
    config_free();
 }
 
diff --git a/runloop_data.c b/runloop_data.c
index fd73fab6d5..7b3d05a5f8 100644
--- a/runloop_data.c
+++ b/runloop_data.c
@@ -28,28 +28,13 @@
 #include "menu/menu.h"
 #endif
 
-#undef HAVE_THREADS
-typedef struct data_runloop
-{
-   bool inited;
-} data_runloop_t;
-
 static char data_runloop_msg[PATH_MAX_LENGTH];
 
-static data_runloop_t g_data_runloop;
-
 void rarch_main_data_deinit(void)
 {
-   g_data_runloop.inited = false;
-
    rarch_task_deinit();
 }
 
-void rarch_main_data_free(void)
-{
-   memset(&g_data_runloop, 0, sizeof(g_data_runloop));
-}
-
 bool rarch_main_data_active(void)
 {
    return false;
@@ -79,24 +64,15 @@ void rarch_main_data_iterate(void)
 
 static void rarch_main_data_init(void)
 {
-   g_data_runloop.inited = true;
-
    rarch_task_init();
 }
 
 void rarch_main_data_clear_state(void)
 {
    rarch_main_data_deinit();
-   rarch_main_data_free();
    rarch_main_data_init();
 }
 
-
-void rarch_main_data_init_queues(void)
-{
-}
-
-
 void rarch_main_data_msg_queue_push(unsigned type,
       const char *msg, const char *msg2,
       unsigned prio, unsigned duration, bool flush)
diff --git a/runloop_data.h b/runloop_data.h
index 5802a244bd..68403cad67 100644
--- a/runloop_data.h
+++ b/runloop_data.h
@@ -44,12 +44,6 @@ void rarch_main_data_iterate(void);
 
 void rarch_main_data_deinit(void);
 
-void rarch_main_data_free(void);
-
-void rarch_main_data_init_queues(void);
-
-bool rarch_main_data_active(void);
-
 #ifdef __cplusplus
 }
 #endif