diff --git a/src/manager.cpp b/src/manager.cpp
index c26e6ba33b4095d0e52fdb0b44dda2ffeb61480a..dbe0fa338efad627d73c3fe31966bd20eb001964 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -1008,8 +1008,7 @@ Manager::unregisterAccounts()
 std::string
 Manager::outgoingCall(const std::string& account_id,
                       const std::string& to,
-                      const std::vector<DRing::MediaMap>& mediaList,
-                      std::shared_ptr<Conference> conference)
+                      const std::vector<DRing::MediaMap>& mediaList)
 {
     JAMI_DBG() << "try outgoing call to '" << to << "'"
                << " with account '" << account_id << "'";
@@ -1485,7 +1484,7 @@ Manager::createConfFromParticipantList(const std::string& accountId,
         pimpl_->unsetCurrentCall();
 
         // Create call
-        auto callId = outgoingCall(account, tostr, {}, conf);
+        auto callId = outgoingCall(account, tostr, {});
         if (callId.empty())
             continue;
 
@@ -1564,10 +1563,15 @@ Manager::joinConference(const std::string& accountId,
                         const std::string& confId2)
 {
     auto account = getAccount(accountId);
+    auto account2 = getAccount(account2Id);
     if (not account) {
         JAMI_ERR("Can't find account: %s", accountId.c_str());
         return false;
     }
+    if (not account2) {
+        JAMI_ERR("Can't find account: %s", account2Id.c_str());
+        return false;
+    }
 
     auto conf = account->getConference(confId1);
     if (not conf) {
@@ -1575,7 +1579,7 @@ Manager::joinConference(const std::string& accountId,
         return false;
     }
 
-    auto conf2 = account->getConference(confId2);
+    auto conf2 = account2->getConference(confId2);
     if (not conf2) {
         JAMI_ERR("Not a valid conference ID: %s", confId2.c_str());
         return false;
diff --git a/src/manager.h b/src/manager.h
index f4138b3cc791a1ab241365038b5245b51d2c81ef..585c1fbd6d36ce358d9cddc009f4bac437711df6 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -149,13 +149,11 @@ public:
      * @param callee the callee's ID/URI. Depends on the account type.
      * Refer to placeCall/placeCallWithMedia documentations.
      * @param mediaList a list of medias to include
-     * @param confId the conference ID if any
      * @return the call ID on success, empty string otherwise
      */
     std::string outgoingCall(const std::string& accountId,
                              const std::string& callee,
-                             const std::vector<DRing::MediaMap>& mediaList = {},
-                             std::shared_ptr<Conference> conference = {});
+                             const std::vector<DRing::MediaMap>& mediaList = {});
 
     /**
      * Functions which occur with a user's action
diff --git a/src/media/rtp_session.h b/src/media/rtp_session.h
index 453befe8cdd8ee2ebe534f7e74537adc711a7469..1f6bb754299e75100d6cb7768a797247f3ead597 100644
--- a/src/media/rtp_session.h
+++ b/src/media/rtp_session.h
@@ -64,13 +64,6 @@ public:
         receive_ = receive;
     }
 
-    bool isReceiving() const noexcept
-    {
-        return receive_.enabled
-               && (receive_.direction_ == MediaDirection::RECVONLY
-                   || receive_.direction_ == MediaDirection::SENDRECV);
-    }
-
     void setMtu(uint16_t mtu) { mtu_ = mtu; }
 
     void setSuccessfulSetupCb(const std::function<void(MediaType, bool)>& cb)