diff --git a/include/gui/Surface.h b/include/gui/Surface.h
index cba11b8..8654f76 100644
--- a/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@ -107,11 +107,9 @@
 // ---------------------------------------------------------------------------
 
 /*
- * This is a small wrapper around SurfaceTextureClient that provides some
- * helper classes for Binder interaction.
+ * This is a small wrapper around SurfaceTextureClient.
  *
- * TODO: rename to SurfaceJniHelper.  May want to move SurfaceInfo and
- * the associated lock() / unlockAndPost() calls to STC.
+ * TODO: rename and/or merge with STC.
  */
 class Surface : public SurfaceTextureClient
 {