diff --git a/libp2p/peer/peerstore.py b/libp2p/peer/peerstore.py
index 1f5ea36a..043aaf0d 100644
--- a/libp2p/peer/peerstore.py
+++ b/libp2p/peer/peerstore.py
@@ -39,8 +39,6 @@ from .peerinfo import (
 PERMANENT_ADDR_TTL = 0
 
 
-# TODO: Set up an async task for periodic peer-store cleanup
-# for expired addresses and records.
 class PeerRecordState:
     envelope: Envelope
     seq: int
@@ -217,7 +215,6 @@ class PeerStore(IPeerStore):
 
     # -----CERT-ADDR-BOOK-----
 
-    # TODO: Make proper use of this function
     def maybe_delete_peer_record(self, peer_id: ID) -> None:
         """
         Delete the signed peer record for a peer if it has no know
diff --git a/libp2p/security/noise/transport.py b/libp2p/security/noise/transport.py
index 8fdd6b6e..b26e0644 100644
--- a/libp2p/security/noise/transport.py
+++ b/libp2p/security/noise/transport.py
@@ -29,11 +29,6 @@ class Transport(ISecureTransport):
     early_data: bytes | None
     with_noise_pipes: bool
 
-    # NOTE: Implementations that support Noise Pipes must decide whether to use
-    #   an XX or IK handshake based on whether they possess a cached static
-    #   Noise key for the remote peer.
-    # TODO: A storage of seen noise static keys for pattern IK?
-
     def __init__(
         self,
         libp2p_keypair: KeyPair,
diff --git a/newsfragments/816.internal.rst b/newsfragments/816.internal.rst
new file mode 100644
index 00000000..ade49df8
--- /dev/null
+++ b/newsfragments/816.internal.rst
@@ -0,0 +1 @@
+The TODO IK patterns in Noise has been deprecated in specs: https://github.com/libp2p/specs/tree/master/noise#handshake-pattern
diff --git a/newsfragments/819.internal.rst b/newsfragments/819.internal.rst
new file mode 100644
index 00000000..65890f5e
--- /dev/null
+++ b/newsfragments/819.internal.rst
@@ -0,0 +1,3 @@
+Remove the already completed TODO tasks in Peerstore:
+TODO: Set up an async task for periodic peer-store cleanup for expired addresses and records.
+TODO: Make proper use of this function