diff --git a/src/auto_dirty.cpp b/src/auto_dirty.cpp
index 614fafe..5564716 100644
--- a/src/auto_dirty.cpp
+++ b/src/auto_dirty.cpp
@@ -5,14 +5,14 @@
 // TODO: add more events
 
 void AutoDirty::subscribe(void) {
-	_tc.subscribe(this, Tox_Event::TOX_EVENT_SELF_CONNECTION_STATUS);
-	_tc.subscribe(this, Tox_Event::TOX_EVENT_FRIEND_CONNECTION_STATUS);
-	_tc.subscribe(this, Tox_Event::TOX_EVENT_FRIEND_REQUEST);
-	_tc.subscribe(this, Tox_Event::TOX_EVENT_GROUP_INVITE);
-	_tc.subscribe(this, Tox_Event::TOX_EVENT_GROUP_SELF_JOIN);
-	_tc.subscribe(this, Tox_Event::TOX_EVENT_GROUP_PEER_JOIN);
-	_tc.subscribe(this, Tox_Event::TOX_EVENT_GROUP_PEER_EXIT);
-	_tc.subscribe(this, Tox_Event::TOX_EVENT_CONFERENCE_INVITE);
+	_tc.subscribe(this, Tox_Event_Type::TOX_EVENT_SELF_CONNECTION_STATUS);
+	_tc.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_CONNECTION_STATUS);
+	_tc.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_REQUEST);
+	_tc.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_INVITE);
+	_tc.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_SELF_JOIN);
+	_tc.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_PEER_JOIN);
+	_tc.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_PEER_EXIT);
+	_tc.subscribe(this, Tox_Event_Type::TOX_EVENT_CONFERENCE_INVITE);
 }
 
 AutoDirty::AutoDirty(ToxClient& tc) : _tc(tc) {
diff --git a/src/message_command_dispatcher.cpp b/src/message_command_dispatcher.cpp
index c992e85..169925a 100644
--- a/src/message_command_dispatcher.cpp
+++ b/src/message_command_dispatcher.cpp
@@ -13,16 +13,6 @@
 #include <map>
 #include <cassert>
 
-//MessageCommandDispatcher::Command::Command(Command&& other) :
-	//m(std::move(other.m)),
-	//m_prefix(std::move(other.m_prefix)),
-	//command(std::move(other.command)),
-	//fn(std::move(other.fn)),
-	//help_text(std::move(other.help_text))
-//{
-	//// is this really needed?
-//}
-
 MessageCommandDispatcher::MessageCommandDispatcher(
 	Contact3Registry& cr,
 	RegistryMessageModel& rmm,