diff --git a/src/uibuttons.h b/src/uibuttons.h
index 10ead68..2070018 100644
--- a/src/uibuttons.h
+++ b/src/uibuttons.h
@@ -84,8 +84,6 @@ private:
 	uint16_t m_debounceTimer;
 	// Number of clicks recorded since last timer reset
 	uint8_t m_numClicks;
-
-public:
 	// Event to fire on click
 	BtnEvent m_clickEvent;
 	// Event to fire on double click
diff --git a/src/userinterface.cpp b/src/userinterface.cpp
index 5836dc2..034565c 100644
--- a/src/userinterface.cpp
+++ b/src/userinterface.cpp
@@ -233,18 +233,6 @@ void CUserInterface::EncoderEventHandler (CKY040::TEvent Event)
 						      : CUIMenu::MenuEventStepDown);
 		break;
 
-	case CKY040::EventSwitchClick:
-		m_Menu.EventHandler (CUIMenu::MenuEventBack);
-		break;
-
-	case CKY040::EventSwitchDoubleClick:
-		m_Menu.EventHandler (CUIMenu::MenuEventSelect);
-		break;
-
-	case CKY040::EventSwitchTripleClick:
-		m_Menu.EventHandler (CUIMenu::MenuEventHome);
-		break;
-
 	case CKY040::EventSwitchHold:
 		if (m_pRotaryEncoder->GetHoldSeconds () >= 120)
 		{