diff --git a/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala b/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala
index 53ae2f2d8b..aed6e3ba76 100644
--- a/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala
+++ b/be2-scala/src/main/scala/ch/epfl/pop/decentralized/ConnectionMediator.scala
@@ -77,7 +77,7 @@ final case class ConnectionMediator(
           Right(JsonRpcRequest(
             RpcValidator.JSON_RPC_VERSION,
             MethodType.heartbeat,
-            new ParamsWithMap(Map.empty), // new ParamsWithMap(map),
+            new ParamsWithMap(Map.empty),
             None
           ))
         )
diff --git a/be2-scala/src/main/scala/ch/epfl/pop/storage/DbActor.scala b/be2-scala/src/main/scala/ch/epfl/pop/storage/DbActor.scala
index b0cec8bb90..665a96ae73 100644
--- a/be2-scala/src/main/scala/ch/epfl/pop/storage/DbActor.scala
+++ b/be2-scala/src/main/scala/ch/epfl/pop/storage/DbActor.scala
@@ -171,7 +171,7 @@ final case class DbActor(
 
     val askAddresses = Await.ready(connectionMediator ? ConnectionMediator.ReadPeersClientAddress(), duration).value.get
     val addresses = askAddresses match {
-      case Success(ConnectionMediator.ReadPeersClientAddressAck(result)) => List.empty // result
+      case Success(ConnectionMediator.ReadPeersClientAddressAck(result)) => result
       case _                                                             => List.empty
     }