diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f327c304..53df5c82 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,19 +16,6 @@ set(
   app/gfx/tilesheet.cc
 )
 
-set(
-  YAZE_APP_ZELDA3_SRC
-  app/zelda3/overworld/overworld_map.cc
-  app/zelda3/overworld/overworld.cc
-  app/zelda3/screen/inventory.cc
-  app/zelda3/screen/title_screen.cc
-  app/zelda3/sprite/sprite.cc
-  app/zelda3/music/tracker.cc
-  app/zelda3/dungeon/room.cc
-  app/zelda3/dungeon/room_object.cc
-  app/zelda3/dungeon/object_renderer.cc
-)
-
 set(
   YAZE_GUI_SRC
   app/gui/asset_browser.cc
@@ -36,7 +23,6 @@ set(
   app/gui/input.cc
   app/gui/style.cc
   app/gui/color.cc
-  app/gui/pipeline.cc
   app/gui/zeml.cc
 )
 
diff --git a/src/app/editor/code/memory_editor.h b/src/app/editor/code/memory_editor.h
index a0c267a1..f87fb0fd 100644
--- a/src/app/editor/code/memory_editor.h
+++ b/src/app/editor/code/memory_editor.h
@@ -12,7 +12,6 @@
 #include "app/core/project.h"
 #include "app/editor/code/assembly_editor.h"
 #include "app/editor/code/memory_editor.h"
-#include "app/editor/utils/gfx_context.h"
 #include "app/editor/dungeon/dungeon_editor.h"
 #include "app/editor/graphics/graphics_editor.h"
 #include "app/editor/graphics/palette_editor.h"
@@ -21,6 +20,7 @@
 #include "app/editor/overworld_editor.h"
 #include "app/editor/sprite/sprite_editor.h"
 #include "app/editor/utils/editor.h"
+#include "app/editor/utils/gfx_context.h"
 #include "app/editor/utils/recent_files.h"
 #include "app/emu/emulator.h"
 #include "app/gfx/snes_palette.h"
@@ -28,7 +28,6 @@
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
 
diff --git a/src/app/editor/dungeon/dungeon_editor.cc b/src/app/editor/dungeon/dungeon_editor.cc
index 81b9cdad..ccfcc44b 100644
--- a/src/app/editor/dungeon/dungeon_editor.cc
+++ b/src/app/editor/dungeon/dungeon_editor.cc
@@ -9,7 +9,6 @@
 #include "app/gui/color.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/rom.h"
 #include "app/zelda3/dungeon/object_names.h"
 #include "app/zelda3/dungeon/room_names.h"
diff --git a/src/app/editor/graphics/gfx_group_editor.cc b/src/app/editor/graphics/gfx_group_editor.cc
index 4c2bc530..49e856e5 100644
--- a/src/app/editor/graphics/gfx_group_editor.cc
+++ b/src/app/editor/graphics/gfx_group_editor.cc
@@ -15,7 +15,6 @@
 #include "app/gui/color.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
 
diff --git a/src/app/editor/graphics/gfx_group_editor.h b/src/app/editor/graphics/gfx_group_editor.h
index b0e476bc..fe7391f4 100644
--- a/src/app/editor/graphics/gfx_group_editor.h
+++ b/src/app/editor/graphics/gfx_group_editor.h
@@ -13,7 +13,6 @@
 #include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
-#include "app/gui/pipeline.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
diff --git a/src/app/editor/graphics/graphics_editor.cc b/src/app/editor/graphics/graphics_editor.cc
index 9575b5cd..474b871f 100644
--- a/src/app/editor/graphics/graphics_editor.cc
+++ b/src/app/editor/graphics/graphics_editor.cc
@@ -18,7 +18,6 @@
 #include "app/gui/canvas.h"
 #include "app/gui/color.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
 
diff --git a/src/app/editor/graphics/graphics_editor.h b/src/app/editor/graphics/graphics_editor.h
index d8be0cb7..526cd03b 100644
--- a/src/app/editor/graphics/graphics_editor.h
+++ b/src/app/editor/graphics/graphics_editor.h
@@ -15,7 +15,6 @@
 #include "app/gui/asset_browser.h"
 #include "app/gui/canvas.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
 
diff --git a/src/app/editor/graphics/tile16_editor.cc b/src/app/editor/graphics/tile16_editor.cc
index eb5ecbbe..d1b3fa85 100644
--- a/src/app/editor/graphics/tile16_editor.cc
+++ b/src/app/editor/graphics/tile16_editor.cc
@@ -16,7 +16,6 @@
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
diff --git a/src/app/editor/graphics/tile16_editor.h b/src/app/editor/graphics/tile16_editor.h
index 0eff06a6..1ef728d2 100644
--- a/src/app/editor/graphics/tile16_editor.h
+++ b/src/app/editor/graphics/tile16_editor.h
@@ -7,16 +7,15 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "app/editor/utils/gfx_context.h"
 #include "app/editor/graphics/palette_editor.h"
 #include "app/editor/utils/editor.h"
+#include "app/editor/utils/gfx_context.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
 #include "app/gfx/tilesheet.h"
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
-#include "app/gui/pipeline.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
 
@@ -30,9 +29,9 @@ namespace editor {
 class Tile16Editor : public context::GfxContext, public SharedRom {
  public:
   absl::Status InitBlockset(gfx::Bitmap* tile16_blockset_bmp,
-                    gfx::Bitmap current_gfx_bmp,
-                    const std::vector<gfx::Bitmap>& tile16_individual,
-                    uint8_t all_tiles_types[0x200]);
+                            gfx::Bitmap current_gfx_bmp,
+                            const std::vector<gfx::Bitmap>& tile16_individual,
+                            uint8_t all_tiles_types[0x200]);
 
   absl::Status Update();
   absl::Status DrawMenu();
diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc
index d501b981..31f7a622 100644
--- a/src/app/editor/master_editor.cc
+++ b/src/app/editor/master_editor.cc
@@ -30,7 +30,6 @@
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/gui/style.h"
 #include "app/rom.h"
 
diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h
index 6a602c03..0be96af5 100644
--- a/src/app/editor/master_editor.h
+++ b/src/app/editor/master_editor.h
@@ -31,7 +31,6 @@
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/rom.h"
 
 namespace yaze {
diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc
index 9cf5d2d6..53f19160 100644
--- a/src/app/editor/overworld_editor.cc
+++ b/src/app/editor/overworld_editor.cc
@@ -21,7 +21,6 @@
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
 #include "app/gui/input.h"
-#include "app/gui/pipeline.h"
 #include "app/gui/style.h"
 #include "app/gui/zeml.h"
 #include "app/rom.h"
diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h
index ef37f639..7d47b420 100644
--- a/src/app/editor/overworld_editor.h
+++ b/src/app/editor/overworld_editor.h
@@ -22,7 +22,6 @@
 #include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
-#include "app/gui/pipeline.h"
 #include "app/gui/zeml.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
diff --git a/src/app/editor/utils/gfx_context.cc b/src/app/editor/utils/gfx_context.cc
index dd8d7cef..849093d9 100644
--- a/src/app/editor/utils/gfx_context.cc
+++ b/src/app/editor/utils/gfx_context.cc
@@ -4,14 +4,13 @@
 
 #include <cmath>
 
-#include "app/editor/utils/editor.h"
 #include "app/editor/graphics/palette_editor.h"
+#include "app/editor/utils/editor.h"
 #include "app/gfx/bitmap.h"
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
-#include "app/gui/pipeline.h"
 #include "app/rom.h"
 
 namespace yaze {
diff --git a/src/app/editor/utils/gfx_context.h b/src/app/editor/utils/gfx_context.h
index 74dff9c1..5afd90ef 100644
--- a/src/app/editor/utils/gfx_context.h
+++ b/src/app/editor/utils/gfx_context.h
@@ -12,7 +12,6 @@
 #include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"
 #include "app/gui/icons.h"
-#include "app/gui/pipeline.h"
 #include "app/rom.h"
 
 namespace yaze {
diff --git a/src/app/gui/pipeline.cc b/src/app/gui/pipeline.cc
deleted file mode 100644
index 09ce2e51..00000000
--- a/src/app/gui/pipeline.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "pipeline.h"
-
-namespace yaze {
-namespace app {
-namespace gui {
-
-
-
-
-
-}  // namespace gui
-}  // namespace app
-}  // namespace yaze
\ No newline at end of file
diff --git a/src/app/gui/pipeline.h b/src/app/gui/pipeline.h
deleted file mode 100644
index 5d6e8eb6..00000000
--- a/src/app/gui/pipeline.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef YAZE_APP_CORE_PIPELINE_H
-#define YAZE_APP_CORE_PIPELINE_H
-
-namespace yaze {
-namespace app {
-namespace gui {
-
-
-
-}  // namespace gui
-}  // namespace app
-}  // namespace yaze
-
-#endif
\ No newline at end of file
diff --git a/src/cli/command_handler.h b/src/cli/command_handler.h
index cb1f93a1..13a837ef 100644
--- a/src/cli/command_handler.h
+++ b/src/cli/command_handler.h
@@ -20,7 +20,6 @@
 #include "app/gfx/snes_palette.h"
 #include "app/gfx/snes_tile.h"
 #include "app/gui/canvas.h"
-#include "app/gui/pipeline.h"
 #include "app/rom.h"  // for Rom
 #include "app/zelda3/overworld/overworld.h"
 #include "cli/patch.h"  // for ApplyBpsPatch, CreateBpsPatch