diff --git a/src/sys/sys_joybus.c b/src/sys/sys_joybus.c
index 415d630b..4d697173 100644
--- a/src/sys/sys_joybus.c
+++ b/src/sys/sys_joybus.c
@@ -92,10 +92,8 @@ void Controller_ReadData(void) {
         }
     } else {
         osContStartReadData(&gSerialEventQueue);
-        MQ_WAIT_FOR_MESG(&gSerialEventQueue, NULL);
         osContGetReadData(sNextController);
     }
-    osSendMesg(&gControllerMesgQueue, OS_MESG_32(SI_CONT_READ_DONE), OS_MESG_PRI_NORMAL);
 }
 
 bool Save_ReadData(void) {
diff --git a/src/sys/sys_main.c b/src/sys/sys_main.c
index 0d50b0e9..62b12c4d 100644
--- a/src/sys/sys_main.c
+++ b/src/sys/sys_main.c
@@ -234,12 +234,9 @@ void Graphics_ThreadUpdate() {
 
     gSysFrameCount++;
     Graphics_InitializeTask(gSysFrameCount);
-    osRecvMesg(&gControllerMesgQueue, NULL, OS_MESG_NOBLOCK);
-    osSendMesg(&gSerialThreadMesgQueue, OS_MESG_32(SI_RUMBLE), OS_MESG_PRI_NORMAL);
     Controller_UpdateInput();
     Controller_ReadData();
     Controller_Rumble();
-    osSendMesg(&gSerialThreadMesgQueue, OS_MESG_32(SI_READ_CONTROLLER), OS_MESG_PRI_NORMAL);
     Main_SetVIMode();
     {
         __gSPSegment(gUnkDisp1++, 0, 0);
@@ -254,7 +251,6 @@ void Graphics_ThreadUpdate() {
         gDPFullSync(gMasterDisp++);
         gSPEndDisplayList(gMasterDisp++);
     }
-    osRecvMesg(&gGfxTaskMesgQueue, NULL, OS_MESG_BLOCK);
     Graphics_SetTask();
 
     if (GfxDebuggerIsDebuggingRequested()) {
@@ -277,7 +273,6 @@ void Graphics_ThreadUpdate() {
     //     osRecvMesg(&gGfxVImsgQueue, NULL, OS_MESG_BLOCK);
     // }
 
-    osSendMesg(&gTaskMesgQueue, OS_MESG_PTR(NULL), OS_MESG_NOBLOCK);
     Audio_Update();
 }