diff --git a/drm_lease.c b/drm_lease.c
index 7d1370d..517185f 100644
--- a/drm_lease.c
+++ b/drm_lease.c
@@ -50,8 +50,6 @@ along with 12to11.  If not, see <https://www.gnu.org/licenses/>.  */
    named "outputs".  This file uses a mix of both the the X
    terminology and the KMS/DRM terminology.  */
 
-/* TODO: dynamic output updating.  */
-
 typedef struct _DrmLeaseDevice DrmLeaseDevice;
 typedef struct _DrmLeaseDeviceRef DrmLeaseDeviceRef;
 typedef struct _DrmLeaseConnector DrmLeaseConnector;
diff --git a/subcompositor.c b/subcompositor.c
index e639de8..07e94a1 100644
--- a/subcompositor.c
+++ b/subcompositor.c
@@ -1244,9 +1244,7 @@ ViewUnparent (View *child)
   ViewRecomputeChildren (child, NULL);
 
   /* Now that the view hierarchy has been changed, garbage the
-     subcompositor.  TODO: an optimization for removing views would be
-     to damage each intersecting view before child->link instead, if
-     view bounds did not change.  */
+     subcompositor.  */
   if (child->subcompositor)
     {
       /* Update the bounds of the subcompositor.  */
diff --git a/xdata.c b/xdata.c
index 3102ead..3875c82 100644
--- a/xdata.c
+++ b/xdata.c
@@ -445,8 +445,7 @@ NoticeTransferWritable (int fd, void *data, WriteFd *writefd)
   transfer = data;
   info = GetTransferData (transfer);
 
-  /* Start by reading at most this many bytes from the property.
-     TODO: take into account sizeof (long) == 8.  */
+  /* Start by reading at most this many bytes from the property.  */
   quantum = SelectionQuantum () / 4 * 4;
 
   if (!info->chunk)