diff --git a/libp2p/pubsub/gossipsub.py b/libp2p/pubsub/gossipsub.py
index 65253e2..a6cee2f 100644
--- a/libp2p/pubsub/gossipsub.py
+++ b/libp2p/pubsub/gossipsub.py
@@ -150,17 +150,11 @@ class GossipSub(IPubsubRouter):
         for topic in self.mesh:
             if peer_id in self.mesh[topic]:
                 # Delete the entry if no other peers left
-                if len(self.mesh[topic]) == 1:
-                    del self.mesh[topic]
-                else:
-                    self.mesh[topic].remove(peer_id)
+                self.mesh[topic].remove(peer_id)
         for topic in self.fanout:
             if peer_id in self.fanout[topic]:
                 # Delete the entry if no other peers left
-                if len(self.fanout[topic]) == 1:
-                    del self.fanout[topic]
-                else:
-                    self.fanout[topic].remove(peer_id)
+                self.fanout[topic].remove(peer_id)
 
         self.peers_to_protocol.pop(peer_id, None)
 
@@ -647,10 +641,7 @@ class GossipSub(IPubsubRouter):
 
         # Remove peer from mesh for topic, if peer is in topic
         if topic in self.mesh and sender_peer_id in self.mesh[topic]:
-            if len(self.mesh[topic]) == 1:
-                del self.mesh[topic]
-            else:
-                self.mesh[topic].remove(sender_peer_id)
+            self.mesh[topic].remove(sender_peer_id)
 
     # RPC emitters
 
diff --git a/libp2p/pubsub/pubsub.py b/libp2p/pubsub/pubsub.py
index 45e7ffc..25ab81e 100644
--- a/libp2p/pubsub/pubsub.py
+++ b/libp2p/pubsub/pubsub.py
@@ -317,10 +317,7 @@ class Pubsub:
         for topic in self.peer_topics:
             if peer_id in self.peer_topics[topic]:
                 # Delete the entry if no other peers left
-                if len(self.peer_topics[topic]) == 1:
-                    del self.peer_topics[topic]
-                else:
-                    self.peer_topics[topic].remove(peer_id)
+                self.peer_topics[topic].remove(peer_id)
 
         self.router.remove_peer(peer_id)
 
@@ -364,10 +361,7 @@ class Pubsub:
             if sub_message.topicid in self.peer_topics:
                 if origin_id in self.peer_topics[sub_message.topicid]:
                     # Delete the entry if no other peers left
-                    if len(self.peer_topics[sub_message.topicid]) == 1:
-                        del self.peer_topics[sub_message.topicid]
-                    else:
-                        self.peer_topics[sub_message.topicid].remove(origin_id)
+                    self.peer_topics[sub_message.topicid].remove(origin_id)
 
     # FIXME(mhchia): Change the function name?
     async def handle_talk(self, publish_message: rpc_pb2.Message) -> None: