diff --git a/doc/TODO b/doc/TODO
index 1961c4e9a1..a6c6e2bc90 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -80,6 +80,8 @@ Short-term:
         X remove per-connection rate limiting
         - Make it harder to circumvent bandwidth caps: look at number of bytes
           sent across sockets, not number sent inside TLS stream.
+        - Audit users of connnection_remove and connection_free outside of
+          main.c; many should use mark_for_close instead.
 
 On-going
         . Better comments for functions!