diff --git a/docs/apidoc/kafka.rst b/docs/apidoc/kafka.rst
index a29e06345..c05f8cc14 100644
--- a/docs/apidoc/kafka.rst
+++ b/docs/apidoc/kafka.rst
@@ -23,6 +23,7 @@ kafka.cluster module
     :show-inheritance:
 
 
+# TODO should this be pointing at client_async?
 kafka.client module
 -------------------
 
diff --git a/kafka/__init__.py b/kafka/__init__.py
index c6194d8a8..47b10b190 100644
--- a/kafka/__init__.py
+++ b/kafka/__init__.py
@@ -25,7 +25,7 @@ def emit(self, record):
 from kafka.conn import BrokerConnection
 from kafka.protocol import (
     create_message, create_gzip_message, create_snappy_message)
-from kafka.partitioner import RoundRobinPartitioner, HashedPartitioner, Murmur2Partitioner
+from kafka.partitioner import RoundRobinPartitioner, HashedPartitioner, Murmur2Partitioner  # TODO Murmur2Partitioner might be removable?
 from kafka.structs import TopicPartition, OffsetAndMetadata
 from kafka.serializer import Serializer, Deserializer
 
diff --git a/kafka/partitioner/hashed.py b/kafka/partitioner/hashed.py
index 0929459b8..980b61f17 100644
--- a/kafka/partitioner/hashed.py
+++ b/kafka/partitioner/hashed.py
@@ -26,6 +26,7 @@ def partition(self, key, partitions=None):
         return partitions[idx]
 
 
+# TODO is this already done?
 # Default will change to Murmur2 in 0.10 release
 HashedPartitioner = LegacyPartitioner
 
diff --git a/kafka/producer/buffer.py b/kafka/producer/buffer.py
index d1eeaf1a6..7bd027f1c 100644
--- a/kafka/producer/buffer.py
+++ b/kafka/producer/buffer.py
@@ -238,6 +238,7 @@ def queued(self):
         with self._lock:
             return len(self._waiters)
 
+# TODO should this be removed or finished?
 '''
 class BufferPool(object):
     """
diff --git a/kafka/protocol/struct.py b/kafka/protocol/struct.py
index 3288172cf..33426324d 100644
--- a/kafka/protocol/struct.py
+++ b/kafka/protocol/struct.py
@@ -65,6 +65,7 @@ def __eq__(self, other):
                 return False
         return True
 
+# TODO should this be removed or finished?
 """
 class MetaStruct(type):
     def __new__(cls, clsname, bases, dct):