diff --git a/midi2cv/midi2cv.cc b/midi2cv/midi2cv.cc
index 2feeb6d..d1d492a 100644
--- a/midi2cv/midi2cv.cc
+++ b/midi2cv/midi2cv.cc
@@ -116,7 +116,6 @@ void Init(void)
   gpio.Init();
   display.Init();
   encoder.Init();
-  ui.Init();
   InitTimers();
 }
 
diff --git a/midi2cv/ui.cc b/midi2cv/ui.cc
index 36d953b..96091a3 100644
--- a/midi2cv/ui.cc
+++ b/midi2cv/ui.cc
@@ -10,16 +10,16 @@
 
 using namespace stmlib;
 
-#define HEADER_HEIGHT 14
 const uint32_t kEncoderLongPressTime = 600;
 
+// TODO: This is kind of ugly, can we improve this somehow?
 Part parts[4];
 Part* part_pointers[4] = {&parts[0], &parts[1], &parts[2], &parts[3]};
 MainMenu mainMenu(part_pointers);
 
-void UI::Init()
+UI::UI()
 {
-  input_queue.Init();
+  this->input_queue.Init();
 }
 
 void UI::Poll()
@@ -104,5 +104,4 @@ void UI::OnIncrement(Event& e)
     mainMenu.down();
   else
     mainMenu.up();
-  //current_menu = (Menu_t) (((uint32_t)current_menu + e.data) % MENU_COUNT);
 }
diff --git a/midi2cv/ui.h b/midi2cv/ui.h
index fdafffd..75c4e45 100644
--- a/midi2cv/ui.h
+++ b/midi2cv/ui.h
@@ -4,26 +4,16 @@
 #include "stmlib/stmlib.h"
 #include "stmlib/ui/event_queue.h"
 
-typedef enum {
-  MENU_PART_1 = 0,
-  MENU_PART_2,
-  MENU_PART_3,
-  MENU_PART_4,
-  MENU_COUNT
-} Menu_t;
-
 class UI {
   public:
-  UI() {}
+  UI();
   ~UI() {}
 
-  void Init();
   void Poll();
   void Flush();
   void DoEvents();
 
   private:
-  Menu_t current_menu;
   stmlib::EventQueue<16> input_queue;
 
   bool long_press_event_sent_;