diff --git a/src/app/editor/music/music_editor.h b/src/app/editor/music/music_editor.h
index 64cf360a..fa51c4fb 100644
--- a/src/app/editor/music/music_editor.h
+++ b/src/app/editor/music/music_editor.h
@@ -1,8 +1,6 @@
 #ifndef YAZE_APP_EDITOR_MUSIC_EDITOR_H
 #define YAZE_APP_EDITOR_MUSIC_EDITOR_H
 
-#include "imgui/imgui.h"
-
 #include "absl/strings/str_format.h"
 #include "app/editor/code/assembly_editor.h"
 #include "app/editor/utils/editor.h"
@@ -11,9 +9,7 @@
 #include "app/gui/input.h"
 #include "app/rom.h"
 #include "app/zelda3/music/tracker.h"
-// #include "snes_spc/demo/demo_util.h"
-// #include "snes_spc/demo/wave_writer.h"
-// #include "snes_spc/snes_spc/spc.h"
+#include "imgui/imgui.h"
 
 namespace yaze {
 namespace app {
@@ -81,8 +77,6 @@ class MusicEditor : public SharedRom, public Editor {
 
   zelda3::music::Tracker music_tracker_;
 
-  // Mix_Music* current_song_ = NULL;
-
   AssemblyEditor assembly_editor_;
   ImGuiTableFlags toolset_table_flags_ = ImGuiTableFlags_SizingFixedFit;
   ImGuiTableFlags music_editor_flags_ = ImGuiTableFlags_SizingFixedFit |