diff --git a/data/mossdeep_gym.s b/data/mossdeep_gym.s
index 59698dea6f..01eb792b7b 100644
--- a/data/mossdeep_gym.s
+++ b/data/mossdeep_gym.s
@@ -1,8 +1,4 @@
-#include "constants/moves.h"
-#include "constants/species.h"
-#include "constants/trainers.h"
     .include "asm/macros.inc"
-    .include "constants/constants.inc"
 
     .section .rodata
 
diff --git a/src/battle_pike.c b/src/battle_pike.c
index 21e7a06149..c118502852 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -104,9 +104,6 @@ static bool8 sub_81A7D8C(struct Task *task);
 static bool8 sub_81A7DE8(struct Task *task);
 
 // Const rom data.
-
-// extern const struct PikeWildMon *const *const gUnknown_08612314[2];
-
 const struct PikeWildMon gUnknown_086121D4[] = 
 {
     {
diff --git a/src/frontier_data.c b/src/frontier_data.c
index 8a78bb57b8..e79bf07fb5 100644
--- a/src/frontier_data.c
+++ b/src/frontier_data.c
@@ -6,13 +6,9 @@
 #include "constants/species.h"
 #include "constants/items.h"
 
-
-
 #include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h"
 #include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h"
 
-
-
 const struct Struct_08613650 gUnknown_08613650[] = 
 {
     {
diff --git a/src/frontier_util.c b/src/frontier_util.c
index d906281846..7ba8746a19 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -49,8 +49,6 @@ struct FrontierBrainMon
 };
 
 extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-//extern const u8 *const *const gUnknown_08611DB0[];
-//extern const u8 *const *const gUnknown_08611DB8[];
 
 extern void sub_81B8558(void);
 
@@ -787,31 +785,6 @@ const u8 *const *const gUnknown_08611DB8[] =
     gUnknown_08611D94,
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // code
 void CallFrontierUtilFunc(void)
 {