diff --git a/include/functions.h b/include/functions.h
index cd0a77f..9f3f489 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1754,7 +1754,7 @@ void func_global_asm_80677EC8(s32 arg0);
 s32 spawnActor(Actors actorIndex, s32 modelIndex);
 s32 func_global_asm_80678014(s32 arg0);
 s32 func_global_asm_80678050(u16);
-// TODO: deleteActor has no documented signature but has been matched
+s32 deleteActor(Actor*);
 s32 func_global_asm_806782E8(Actor *arg0);
 void func_global_asm_806783BC(void);
 void func_global_asm_80678428(Actor *arg0);
diff --git a/include/s32deleteactor.h b/include/s32deleteactor.h
deleted file mode 100644
index 54f7889..0000000
--- a/include/s32deleteactor.h
+++ /dev/null
@@ -1 +0,0 @@
-s32 deleteActor(Actor *);
diff --git a/include/voiddeleteactor.h b/include/voiddeleteactor.h
deleted file mode 100644
index e0936b9..0000000
--- a/include/voiddeleteactor.h
+++ /dev/null
@@ -1,2 +0,0 @@
-void deleteActor(Actor *);
-
diff --git a/src/bonus/code_2690.c b/src/bonus/code_2690.c
index 8775248..3000e56 100644
--- a/src/bonus/code_2690.c
+++ b/src/bonus/code_2690.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 // TODO: Is there a file split somewhere in here? Rodata messes up around D_bonus_8002DDD4
 //rodata
diff --git a/src/boss/KRoolDiddy.c b/src/boss/KRoolDiddy.c
index 6bb42cd..fc07240 100644
--- a/src/boss/KRoolDiddy.c
+++ b/src/boss/KRoolDiddy.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 void func_global_asm_80613CA8(Actor*, s16, f32, f32);
 
diff --git a/src/boss/KRoolLanky.c b/src/boss/KRoolLanky.c
index d3c341d..1b7d153 100644
--- a/src/boss/KRoolLanky.c
+++ b/src/boss/KRoolLanky.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 void func_global_asm_80613CA8(Actor*, s16, f32, f32);
 
diff --git a/src/boss/KutOut.c b/src/boss/KutOut.c
index 5ce485a..4465a78 100644
--- a/src/boss/KutOut.c
+++ b/src/boss/KutOut.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s16 D_boss_80035B00[];
 extern s16 D_boss_80035B08[];
diff --git a/src/boss/MadJack.c b/src/boss/MadJack.c
index 6b33fd1..9c276e8 100644
--- a/src/boss/MadJack.c
+++ b/src/boss/MadJack.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 const s32 D_boss_80036C10[] = {
     0x4F230825,
diff --git a/src/global_asm/code_0.c b/src/global_asm/code_0.c
index f610981..6b4bd0c 100644
--- a/src/global_asm/code_0.c
+++ b/src/global_asm/code_0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_dk64_boot_8000DDCC;
 extern s32 D_dk64_boot_8000DDE4;
diff --git a/src/global_asm/code_1295B0.c b/src/global_asm/code_1295B0.c
index a111d28..ac7fadd 100644
--- a/src/global_asm/code_1295B0.c
+++ b/src/global_asm/code_1295B0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 typedef struct Struct80755690_unk4 Struct80755690_unk4;
 
diff --git a/src/global_asm/code_42630.c b/src/global_asm/code_42630.c
index c5826ff..cb1888f 100644
--- a/src/global_asm/code_42630.c
+++ b/src/global_asm/code_42630.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern u8 D_global_asm_80750AB4;
 
diff --git a/src/global_asm/code_684C0.c b/src/global_asm/code_684C0.c
index 3b7cf15..46ff4bc 100644
--- a/src/global_asm/code_684C0.c
+++ b/src/global_asm/code_684C0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 typedef struct {
     s16 min_x; // 0
diff --git a/src/global_asm/code_80150.c b/src/global_asm/code_80150.c
index 5eaa1a6..ad2bffc 100644
--- a/src/global_asm/code_80150.c
+++ b/src/global_asm/code_80150.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FC8C;
 
diff --git a/src/global_asm/code_89250.c b/src/global_asm/code_89250.c
index 7dc448a..4046936 100644
--- a/src/global_asm/code_89250.c
+++ b/src/global_asm/code_89250.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 int func_global_asm_8071827C(); // TODO: Signature
 int func_global_asm_807197B4(); // TODO: Signature
diff --git a/src/global_asm/code_8D3E0.c b/src/global_asm/code_8D3E0.c
index 3f611ae..7c18dfd 100644
--- a/src/global_asm/code_8D3E0.c
+++ b/src/global_asm/code_8D3E0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern Struct807500B4 D_global_asm_807500B4; // TODO: Array?
 extern Struct807500B4 D_global_asm_807500D4; // TODO: D_global_asm_807500D4[1]?
diff --git a/src/global_asm/code_936B0.c b/src/global_asm/code_936B0.c
index 61948d9..accdd4d 100644
--- a/src/global_asm/code_936B0.c
+++ b/src/global_asm/code_936B0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FFA0;
 extern s32 D_global_asm_80720020; // TODO: Type
@@ -1456,7 +1455,6 @@ void func_global_asm_80696A6C(void) {
     AAD_80696A6C *sp44;
     s16 temp_v0;
     s16 var_a3;
-    Actor *temp;
     s32 temp2;
 
     sp44 = current_actor_pointer->additional_actor_data;
@@ -1498,8 +1496,7 @@ void func_global_asm_80696A6C(void) {
         func_global_asm_8067E278(0, 1);
         func_global_asm_80605314(current_actor_pointer, 0);
         deleteActor(current_actor_pointer);
-        temp = current_actor_pointer->unk11C;
-        if ((temp != NULL) && (temp->unk58 == ACTOR_BOSS_ARMY_DILLO) && (temp->control_state != 0x37)) {
+        if ((current_actor_pointer->unk11C != NULL) && (current_actor_pointer->unk11C->unk58 == ACTOR_BOSS_ARMY_DILLO) && (current_actor_pointer->unk11C->control_state != 0x37)) {
             current_actor_pointer->unk11C->control_state_progress++;
         }
     }
diff --git a/src/global_asm/code_9BF30.c b/src/global_asm/code_9BF30.c
index f158ad8..ab413da 100644
--- a/src/global_asm/code_9BF30.c
+++ b/src/global_asm/code_9BF30.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FBA0; // TODO: Datatype
 
diff --git a/src/global_asm/code_9DD70.c b/src/global_asm/code_9DD70.c
index a4094f9..f3b419c 100644
--- a/src/global_asm/code_9DD70.c
+++ b/src/global_asm/code_9DD70.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s8 D_global_asm_807F6951;
 extern s8 D_global_asm_807F6950;
diff --git a/src/global_asm/code_A2F10.c b/src/global_asm/code_A2F10.c
index 6ab873d..c646a04 100644
--- a/src/global_asm/code_A2F10.c
+++ b/src/global_asm/code_A2F10.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "s32deleteactor.h"
 
 extern s32 D_global_asm_80720BE8;
 
diff --git a/src/global_asm/code_ACDC0.c b/src/global_asm/code_ACDC0.c
index bb604e0..f72f50e 100644
--- a/src/global_asm/code_ACDC0.c
+++ b/src/global_asm/code_ACDC0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s8 D_global_asm_80750560[];
 extern s8 D_global_asm_80750530[];
diff --git a/src/global_asm/code_B1F60.c b/src/global_asm/code_B1F60.c
index c75d01f..2565cd4 100644
--- a/src/global_asm/code_B1F60.c
+++ b/src/global_asm/code_B1F60.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 s32 func_global_asm_8072881C(s32, s32);
 
diff --git a/src/global_asm/code_B2CE0.c b/src/global_asm/code_B2CE0.c
index db17a22..b3699c6 100644
--- a/src/global_asm/code_B2CE0.c
+++ b/src/global_asm/code_B2CE0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FBC8;
 extern s32 D_global_asm_8072073C; // TODO: Proper datatype
diff --git a/src/global_asm/code_BB300.c b/src/global_asm/code_BB300.c
index b6f983d..e7c0ab0 100644
--- a/src/global_asm/code_BB300.c
+++ b/src/global_asm/code_BB300.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern f32 D_global_asm_807502E8;
 extern s16 D_global_asm_807502E0;
diff --git a/src/global_asm/code_C2A90.c b/src/global_asm/code_C2A90.c
index b6eb022..74def46 100644
--- a/src/global_asm/code_C2A90.c
+++ b/src/global_asm/code_C2A90.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FB08; // TODO: Proper datatype
 extern s32 D_global_asm_8071FBA0;
diff --git a/src/global_asm/code_C8C10.c b/src/global_asm/code_C8C10.c
index 1697ece..8d82256 100644
--- a/src/global_asm/code_C8C10.c
+++ b/src/global_asm/code_C8C10.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 void func_global_asm_806C3F10(u8 arg0, u8 arg1, u8 arg2) {
     Actor178 *a178;
diff --git a/src/global_asm/code_CEAE0.c b/src/global_asm/code_CEAE0.c
index 51992f4..7c3b49e 100644
--- a/src/global_asm/code_CEAE0.c
+++ b/src/global_asm/code_CEAE0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 typedef struct {
     void *unk0; // function pointer
diff --git a/src/global_asm/done/code_A6280.c b/src/global_asm/done/code_A6280.c
index 9fc54d8..b280f39 100644
--- a/src/global_asm/done/code_A6280.c
+++ b/src/global_asm/done/code_A6280.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8071FFA0;
 extern s32 D_global_asm_8071FF18;
diff --git a/src/global_asm/done/code_AAAF0.c b/src/global_asm/done/code_AAAF0.c
index a3bcd6c..dd7b7a1 100644
--- a/src/global_asm/done/code_AAAF0.c
+++ b/src/global_asm/done/code_AAAF0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_807203B0; // TODO: Sprite
 extern s32 D_global_asm_807203D4; // TODO: Sprite
diff --git a/src/global_asm/done/code_B6C50.c b/src/global_asm/done/code_B6C50.c
index 461589f..2c7ea19 100644
--- a/src/global_asm/done/code_B6C50.c
+++ b/src/global_asm/done/code_B6C50.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s32 D_global_asm_8072030C;
 extern s32 D_global_asm_80720340; // Sprite
diff --git a/src/global_asm/done/code_CB230.c b/src/global_asm/done/code_CB230.c
index 515fd1f..cf4fa89 100644
--- a/src/global_asm/done/code_CB230.c
+++ b/src/global_asm/done/code_CB230.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 typedef struct {
     s16 unk0;
diff --git a/src/menu/code_3E10.c b/src/menu/code_3E10.c
index 8a2e09a..f156ad2 100644
--- a/src/menu/code_3E10.c
+++ b/src/menu/code_3E10.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 extern s8 D_global_asm_80745844;
 extern s8 opening_cutscene_transition;
diff --git a/src/minecart/code_25F0.c b/src/minecart/code_25F0.c
index 9a30876..cb4f970 100644
--- a/src/minecart/code_25F0.c
+++ b/src/minecart/code_25F0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 /* structs */
 typedef struct {
diff --git a/src/race/code_7BD0.c b/src/race/code_7BD0.c
index 5015c13..614ff9f 100644
--- a/src/race/code_7BD0.c
+++ b/src/race/code_7BD0.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "functions.h"
-#include "voiddeleteactor.h"
 
 /*
 rodata