diff --git a/p2p/peer.go b/p2p/peer.go
index 3c2b08933..be9e73bd5 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -361,7 +361,8 @@ func (p *peer) SocketAddr() *NetAddress {
 // Status returns the peer's ConnectionStatus.
 func (p *peer) Status() ConnectionStatus {
 	return ConnectionStatus{
-		Duration:        time.Since(p.created),
+		Duration: time.Since(p.created),
+		// TODO(rach-id): register ecdsa.PublicKey protobuf definition
 		ConnectionState: p.conn.ConnectionState(),
 	}
 }
diff --git a/p2p/transport.go b/p2p/transport.go
index a94144451..37628c093 100644
--- a/p2p/transport.go
+++ b/p2p/transport.go
@@ -250,7 +250,6 @@ func (mt *MultiplexTransport) Dial(
 	}
 
 	// TODO(xla): Evaluate if we should apply filters if we explicitly dial.
-	//TODO(rach-id): remove peer when disconnected.
 	if err := mt.filterConn(c); err != nil {
 		return nil, err
 	}