diff --git a/include/maker/handlers/buffer_handler.hpp b/include/maker/handlers/buffer_handler.hpp
deleted file mode 100644
index 57009df895ca85ebc19a822d7bb6be540cb4d839..0000000000000000000000000000000000000000
--- a/include/maker/handlers/buffer_handler.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef MAKER_BUFFER_HANDLER_HPP_INCLUDED
-#   define MAKER_INDEX_HPP_INCLUDED
-
-#include <com/context.hpp>
-#include <gfx/ui/handlers.hpp>
-
-namespace mak {
-
-    struct BufferHandler : public gfx::UiEventHandler {
-        static inline std::string self_name() { return "buffer_handler"; };
-
-        BufferHandler();
-        ~BufferHandler();
-
-        void on_size_changed(gfx::UiElement* element) override;
-
-    };
-
-};
-
-#endif
\ No newline at end of file
diff --git a/src/handlers/buffer_handler.cpp b/src/handlers/buffer_handler.cpp
deleted file mode 100644
index bcd9c5360d58cb4534a975bd64d68f9625b1b52a..0000000000000000000000000000000000000000
--- a/src/handlers/buffer_handler.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "maker/handlers/buffer_handler.hpp"
-
-#include <com/context.hpp>
-#include <maker/index.hpp>
-#include <gfx/index.hpp>
-
-using namespace com;
-using namespace gfx;
-
-namespace mak {
-
-    BufferHandler::BufferHandler(): UiEventHandler(self_name()) {}
-    BufferHandler::~BufferHandler() {}
-
-    void BufferHandler::on_size_changed(UiElement* element)
-    {
-        auto* border = element->get_border_object();
-        auto* background = element->get_background_object();
-
-        // Recreate background and border buffers if present
-        if (background)
-        {
-            // Assuming buffers for all states are the same
-            auto* buffer = ui_system()->get_buffers_folder(background)->find<Link>(UiElement::enabled_link_name())->target<Buffer>();
-            buffer->clear();
-            auto path = buffer->folder()->path();
-            buffer_generators()->insert_procedural_rectangle(contract(element->get_normalized_size().hi), buffer->name(), path);
-        }
-
-        if (border)
-        {
-            // Assuming buffers for all states are the same
-            auto* buffer = ui_system()->get_buffers_folder(border)->find<Link>(UiElement::enabled_link_name())->target<Buffer>();
-            buffer->clear();
-            auto path = buffer->folder()->path();
-            buffer_generators()->insert_procedural_rectangle_wireframe(contract(element->get_normalized_size().hi), buffer->name(), path);
-        }
-        // Update objects to show updated buffer
-        for (Folder* subfolder : element->get_foreground_folder()->subfolders()) {
-            if (auto* sub_element = dynamic_cast<UiElement*>(subfolder)) {
-                on_size_changed(sub_element);
-            }
-        }
-        element->update_objects();
-    }
-
-
-}
diff --git a/src/presenter.cpp b/src/presenter.cpp
index 27050f15ebb383b6fe0a392c002f51e41ed8d96a..54749440b89201dfd42c4b347690ae117da81862 100644
--- a/src/presenter.cpp
+++ b/src/presenter.cpp
@@ -8,8 +8,7 @@
 #include <iostream>
 #include <fstream>
 #include <glm/gtx/string_cast.hpp>
-
-#include "maker/handlers/buffer_handler.hpp"
+#include <gfx/ui/handlers.hpp>
 
 namespace mak {