diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py
index a53d387b..db01ac83 100644
--- a/mopidy/mpd/dispatcher.py
+++ b/mopidy/mpd/dispatcher.py
@@ -37,7 +37,6 @@ class MpdDispatcher(object):
         response = []
         filter_chain = [
             self._catch_mpd_ack_errors_filter,
-            # TODO: tokenize filter
             self._authenticate_filter,
             self._command_list_filter,
             self._idle_filter,
diff --git a/mopidy/mpd/protocol/__init__.py b/mopidy/mpd/protocol/__init__.py
index e24af565..3c501bbb 100644
--- a/mopidy/mpd/protocol/__init__.py
+++ b/mopidy/mpd/protocol/__init__.py
@@ -98,7 +98,7 @@ class Commands(object):
         """Create a decorator that registers a handler and validation rules.
 
         Additional keyword arguments are treated as converters/validators to
-        apply to tokens converting them to proper Python type`s.
+        apply to tokens converting them to proper Python types.
 
         Requirements for valid handlers: