diff --git a/core/src/main/java/com/google/bitcoin/core/PeerGroup.java b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java
index 0f4596be..ebe00c9d 100644
--- a/core/src/main/java/com/google/bitcoin/core/PeerGroup.java
+++ b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java
@@ -762,6 +762,7 @@ public class PeerGroup {
                 }
             }
         }
+        // TODO: Remove peerEventListeners from the Peer here.
         peer.removeEventListener(getDataListener);
         EventListenerInvoker.invoke(peerEventListeners, new EventListenerInvoker<PeerEventListener>() {
             @Override