diff --git a/src/app/editor/graphics/gfx_group_editor.cc b/src/app/editor/graphics/gfx_group_editor.cc
index c2f21b9c..ecd74215 100644
--- a/src/app/editor/graphics/gfx_group_editor.cc
+++ b/src/app/editor/graphics/gfx_group_editor.cc
@@ -228,7 +228,7 @@ void DrawPaletteFromPaletteGroup(gfx::SnesPalette &palette) {
   if (palette.empty()) {
     return;
   }
-  for (int n = 0; n < palette.size(); n++) {
+  for (size_t n = 0; n < palette.size(); n++) {
     PushID(n);
     if ((n % 8) != 0) SameLine(0.0f, GetStyle().ItemSpacing.y);
 
diff --git a/src/app/editor/graphics/gfx_group_editor.h b/src/app/editor/graphics/gfx_group_editor.h
index c50b5d49..ee3ebaf8 100644
--- a/src/app/editor/graphics/gfx_group_editor.h
+++ b/src/app/editor/graphics/gfx_group_editor.h
@@ -1,8 +1,6 @@
 #ifndef YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
 #define YAZE_APP_EDITOR_GFX_GROUP_EDITOR_H
 
-#include "imgui/imgui.h"
-
 #include <cmath>
 
 #include "absl/status/status.h"
@@ -16,6 +14,7 @@
 #include "app/gui/style.h"
 #include "app/rom.h"
 #include "app/zelda3/overworld/overworld.h"
+#include "imgui/imgui.h"
 
 namespace yaze {
 namespace app {
@@ -40,13 +39,7 @@ class GfxGroupEditor : public SharedRom {
     selected_spriteset_ = spriteset;
   }
 
-  void InitBlockset(gfx::Bitmap* tile16_blockset) {
-    tile16_blockset_bmp_ = tile16_blockset;
-  }
-
  private:
-  int preview_palette_id_ = 0;
-  int last_sheet_id_ = 0;
   uint8_t selected_blockset_ = 0;
   uint8_t selected_roomset_ = 0;
   uint8_t selected_spriteset_ = 0;
@@ -57,14 +50,6 @@ class GfxGroupEditor : public SharedRom {
   gui::Canvas spriteset_canvas_;
 
   gfx::SnesPalette palette_;
-  gfx::PaletteGroup palette_group_;
-  gfx::Bitmap* tile16_blockset_bmp_;
-
-  std::vector<std::vector<uint8_t>> tile16_individual_data_;
-  std::vector<gfx::Bitmap> tile16_individual_;
-
-  gui::BitmapViewer gfx_group_viewer_;
-  zelda3::overworld::Overworld overworld_;
 };
 
 }  // namespace editor