diff --git a/src/os/code_39db0_len_8a0.c b/src/os/code_39db0_len_8a0.c
deleted file mode 100644
index 74d513375e..0000000000
--- a/src/os/code_39db0_len_8a0.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScCreateScheduler);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScExecuteAudio);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScAddClient);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScRemoveClient);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScResetClientMesgType);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetGfxMQ);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetAudioMQ);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScSetFrameBufferNum);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetFrameRate);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScEventHandler);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScEventBroadcast);
-
-INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScWaitTaskReady);
diff --git a/src/os/code_3a650_len_40.c b/src/os/code_3a650_len_40.c
deleted file mode 100644
index b7f8f3b5c4..0000000000
--- a/src/os/code_3a650_len_40.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_3a650_len_40", nuGfxFuncSet);
diff --git a/src/os/code_3a690_len_40.c b/src/os/code_3a690_len_40.c
deleted file mode 100644
index 9bff4185bb..0000000000
--- a/src/os/code_3a690_len_40.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_3a690_len_40", nuGfxPreNMIFuncSet);
diff --git a/src/os/code_3a6d0_len_20.c b/src/os/code_3a6d0_len_20.c
deleted file mode 100644
index 8cf605b336..0000000000
--- a/src/os/code_3a6d0_len_20.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_3a6d0_len_20", nuGfxTaskAllEndWait);
diff --git a/src/os/code_3a6f0_len_110.c b/src/os/code_3a6f0_len_110.c
deleted file mode 100644
index 09c7bb7b09..0000000000
--- a/src/os/code_3a6f0_len_110.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_3a6f0_len_110", nuGfxSetCfb);
diff --git a/src/os/code_3a800_len_30.c b/src/os/code_3a800_len_30.c
deleted file mode 100644
index b396df9c1b..0000000000
--- a/src/os/code_3a800_len_30.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_3a800_len_30", nuGfxDisplayOff);
diff --git a/src/os/code_3a830_len_20.c b/src/os/code_3a830_len_20.c
deleted file mode 100644
index 865786c617..0000000000
--- a/src/os/code_3a830_len_20.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_3a830_len_20", nuGfxDisplayOn);
diff --git a/src/os/code_3a850_le_a40.c b/src/os/code_3a850_le_a40.c
deleted file mode 100644
index e623dc422c..0000000000
--- a/src/os/code_3a850_le_a40.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuPiInit);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuPiReadRom);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuGfxInit);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContInit);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContDataGet);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContPakMgrInit);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContPakMgrRemove);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakOpen);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFree);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileReadWrite);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileOpen);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileDelete);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileState);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileNum);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakRepairId);
-
-#undef osMotorStop
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", osMotorStop, OSPfs* unk);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbControl);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContRmbMgrInit);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContRmbMgrRemove);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbCheckMesg);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbStartMesg);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FDE4);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FE0C);
-
-INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FE54);
diff --git a/src/os/code_3b290_len_100.c b/src/os/code_3b290_len_100.c
deleted file mode 100644
index 355f256e80..0000000000
--- a/src/os/code_3b290_len_100.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "os/code_3b290_len_100", nuContRmbStart);
-
-INCLUDE_ASM(s32, "os/code_3b290_len_100", nuContRmbCheck);
diff --git a/src/os/nusys/nuContRmbMgr.c b/src/os/nusys/nuContRmbMgr.c
index 79b2033201..76fc26520e 100644
--- a/src/os/nusys/nuContRmbMgr.c
+++ b/src/os/nusys/nuContRmbMgr.c
@@ -108,7 +108,7 @@ void nuContRmbMgrInit(void) {
     nuSiCallBackAdd(&nuContRmbCallBack);
 }
 #else
-void INCLUDE_ASM("os/nuContRmbMgr", nuContRmbMgrInit);
+INCLUDE_ASM(void, "os/nuContRmbMgr", nuContRmbMgrInit);
 #endif
 
 void nuContRmbMgrRemove(void) {
diff --git a/src/os/nusys/nuGfxSetCfb.c b/src/os/nusys/nuGfxSetCfb.c
index 69b284b871..7822178a42 100644
--- a/src/os/nusys/nuGfxSetCfb.c
+++ b/src/os/nusys/nuGfxSetCfb.c
@@ -1,3 +1,3 @@
 #include "common.h"
 
-INCLUDE_API_ASM("os/nuGfxSetCfb", nuGfxSetCfb);
+INCLUDE_ASM(void, "os/nuGfxSetCfb", nuGfxSetCfb);
diff --git a/src/os/nusys/nuSched.c b/src/os/nusys/nuSched.c
index d4fbae7f4e..1e28c2e601 100644
--- a/src/os/nusys/nuSched.c
+++ b/src/os/nusys/nuSched.c
@@ -5,7 +5,7 @@ INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScCreateScheduler, u8 videoMode, u8
 
 INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScExecuteAudio);
 
-INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScExecuteGraphics);
+// INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScExecuteGraphics);
 
 INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScAddClient, NUScClient *c, OSMesgQueue *mq, NUScMsg msgType);
 
@@ -71,7 +71,7 @@ s32 nuScGetFrameRate(void) {
     return nusched.frameRate;
 }
 #else
-(s32, "os/code_39db0_len_8a0", nuScGetFrameRate, void);
+INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetFrameRate, void);
 #endif
 
 INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScEventHandler);
diff --git a/tools/n64splat b/tools/n64splat
deleted file mode 160000
index e9d9a22063..0000000000
--- a/tools/n64splat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e9d9a22063fb19d270829950f4b79a5670bd4bd4
diff --git a/tools/star-rod b/tools/star-rod
deleted file mode 160000
index 3a32d3d6dd..0000000000
--- a/tools/star-rod
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3a32d3d6dda7374e4f32ae86530444e45956d803