diff --git a/matrix/bar_items.py b/matrix/bar_items.py
index 5ae77b2..5a45547 100644
--- a/matrix/bar_items.py
+++ b/matrix/bar_items.py
@@ -15,10 +15,8 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 from __future__ import unicode_literals
-from builtins import str
 
 from matrix.utf import utf8_decode
-from matrix.utils import key_from_value
 
 from matrix.globals import W, SERVERS
 
diff --git a/matrix/server.py b/matrix/server.py
index 1a46e0d..c0c24a0 100644
--- a/matrix/server.py
+++ b/matrix/server.py
@@ -465,7 +465,7 @@ class MatrixServer(object):
         self.sync_time = time.time()
 
     def sync(self, timeout=None, filter=None):
-        # type: Optional[int] -> None
+        # type: (Optional[int], Optional[Dict[Any, Any]]) -> None
         self.sync_time = None
         _, request = self.client.sync(timeout, filter)
         self.send_or_queue(request)
@@ -509,7 +509,7 @@ class MatrixServer(object):
         self.send_or_queue(request)
 
     def room_send_message(self, room_buffer, formatted, msgtype="m.text"):
-        # type: (RoomBuffer, Formatted) -> None
+        # type: (RoomBuffer, Formatted, str) -> None
         if room_buffer.room.encrypted:
             return