diff --git a/waku/node/peer_manager/peer_manager.nim b/waku/node/peer_manager/peer_manager.nim
index 68e59c985..d37e7370f 100644
--- a/waku/node/peer_manager/peer_manager.nim
+++ b/waku/node/peer_manager/peer_manager.nim
@@ -249,13 +249,6 @@ proc selectPeer*(
     var preSelectedPeers =
       if pm.reputationManager.isSome():
         debug "Reputation enabled: consider only non-negative reputation peers"
-        # FIXME: remove double loop
-        for peer in peers:
-          let rep = try:
-            pm.reputationManager.get().getReputation(peer.peerId)
-          except KeyError:
-            none(bool)
-          debug "Peer with reputation:", peer=peer, reputation=rep
         peers.filterIt:
           let rep =
             try:
diff --git a/waku/node/waku_node.nim b/waku/node/waku_node.nim
index 9d2d4c95c..1b3bc9666 100644
--- a/waku/node/waku_node.nim
+++ b/waku/node/waku_node.nim
@@ -1229,9 +1229,6 @@ proc lightpushPublish*(
       error "lightpush publish error", error = msg
       return lighpushErrorResult(LightPushErrorCode.INTERNAL_SERVER_ERROR, msg)
 
-  debug "in lightpushPublish"
-  debug "eligibilityProof: ", eligibilityProof
-
   return await lightpushPublishHandler(node, pubsubForPublish, message, eligibilityProof, toPeer)
 
 ## Waku RLN Relay
diff --git a/waku/waku_api/rest/lightpush/handlers.nim b/waku/waku_api/rest/lightpush/handlers.nim
index 9c178a804..e0ed9cac6 100644
--- a/waku/waku_api/rest/lightpush/handlers.nim
+++ b/waku/waku_api/rest/lightpush/handlers.nim
@@ -94,9 +94,7 @@ proc installLightPushRequestHandler*(
             makeRestResponse(lightpushResultServiceUnavailable(NoPeerNoneFoundError))
       toPeer = some(aPeer)
 
-    debug "in installLightPushRequestHandler"
-    debug "request:", req
-    debug "request.eligibilityProof:", eligibilityProof = req.eligibilityProof
+    debug "Handling Lightpush request:", req
 
     let subFut = node.lightpushPublish(req.pubsubTopic, msg, req.eligibilityProof, toPeer)
 
diff --git a/waku/waku_lightpush/client.nim b/waku/waku_lightpush/client.nim
index ed7aea1a3..19ce0cc25 100644
--- a/waku/waku_lightpush/client.nim
+++ b/waku/waku_lightpush/client.nim
@@ -86,21 +86,18 @@ proc publish*(
   if message.timestamp == 0:
     message.timestamp = getNowInNanosecondTime()
 
-  # FIXME: make more DRY
-  when peer is PeerId:
-    info "publish",
-      peerId = shortLog(peer),
-      msg_hash = computeMessageHash(pubsubTopic.get(""), message).to0xHex
-  else:
-    info "publish",
-      peerId = shortLog(peer.peerId),
-      msg_hash = computeMessageHash(pubsubTopic.get(""), message).to0xHex
+  info "publish",
+    peerId = shortLog(
+      when peer is PeerId: peer
+      else: peer.peerId
+    ),
+    msg_hash = computeMessageHash(pubSubTopic.get(""), message).to0xHex
 
-  # i13n POC: adding eligibilityProof to the request
+  # i13n POC: add eligibilityProof to the request
   let pushRequest = LightpushRequest(
     requestId: generateRequestId(wl.rng), pubSubTopic: pubSubTopic, message: message, eligibilityProof: eligibilityProof
   )
-  debug "in Lightpush client publish: created pushRequest: ", pushRequest
+  debug "Created Lightpush request: ", pushRequest
   let publishedCount = ?await wl.sendPushRequest(pushRequest, peer)
 
   for obs in wl.publishObservers: