diff --git a/TODO b/TODO
index d8d4d5612..e95dd4f52 100644
--- a/TODO
+++ b/TODO
@@ -14,8 +14,6 @@ API issues to fix before 1.0:
 
 - Figure out how many .so objects, how to link, etc
 
-- User-data support ala cairo
-
 - Real subclassing support for vfunc vectors
 
 - Add hb-cairo glue
diff --git a/src/hb-font.h b/src/hb-font.h
index f018a8bb4..9c6947074 100644
--- a/src/hb-font.h
+++ b/src/hb-font.h
@@ -70,16 +70,6 @@ hb_face_get_user_data (hb_face_t          *face,
 		       hb_user_data_key_t *key);
 
 
-/* XXX
- *
- * I have two major concerns about this API as it is right now:
- *
- *   - Jonathan Kew convinced me to make it return NULL if table not found (280af1bd),
- *     however, that is WRONG IMO.  The API should not differentiate between a non-existing
- *     table vs a zero-length table vs a very short table.  It only leads to implementations
- *     that check for non-NULL and assume that they've got a usable table going on...  This
- *     actually happened with Firefox.
- */
 hb_blob_t *
 hb_face_reference_table (hb_face_t *face,
 			 hb_tag_t   tag);