diff --git a/src/media/audio/audio_rtp_session.h b/src/media/audio/audio_rtp_session.h
index e8364841b9bd0dcbab93c5d16f85e59c50dff304..7514437eabddc1ae818965b45b33db5863afc7ee 100644
--- a/src/media/audio/audio_rtp_session.h
+++ b/src/media/audio/audio_rtp_session.h
@@ -48,8 +48,6 @@ public:
     void stop() override;
     void setMuted(bool isMuted);
 
-    void switchInput(const std::string& resource) { input_ = resource; }
-
     void initRecorder(std::shared_ptr<MediaRecorder>& rec) override;
     void deinitRecorder(std::shared_ptr<MediaRecorder>& rec) override;
 
@@ -64,7 +62,6 @@ private:
     uint16_t initSeqVal_ = 0;
     bool muteState_ = false;
     DeviceParams localAudioParams_;
-    std::string input_;
 };
 
 } // namespace jami
diff --git a/src/media/rtp_session.h b/src/media/rtp_session.h
index 348ae94f0f4f3b286190b45b3279c15b227da299..cadcf8fa0130ba399c58bf7f1f51a3fcf135a688 100644
--- a/src/media/rtp_session.h
+++ b/src/media/rtp_session.h
@@ -47,6 +47,8 @@ public:
     virtual void start(std::unique_ptr<IceSocket> rtp_sock, std::unique_ptr<IceSocket> rtcp_sock) = 0;
     virtual void restartSender() = 0;
     virtual void stop() = 0;
+    void switchInput(const std::string& resource) { input_ = resource; }
+    const std::string& getInput() const { return input_; }
 
     virtual void updateMedia(const MediaDescription& send, const MediaDescription& receive)
     {
@@ -70,6 +72,7 @@ protected:
     std::recursive_mutex mutex_;
     std::unique_ptr<SocketPair> socketPair_;
     const std::string callID_;
+    std::string input_;
 
     MediaDescription send_;
     MediaDescription receive_;
diff --git a/src/media/video/video_rtp_session.h b/src/media/video/video_rtp_session.h
index 12865ba565b99ad93b887cddc3eecb724634519d..3bc303bf566e4ac56c6656d6c19510a9f34a169c 100644
--- a/src/media/video/video_rtp_session.h
+++ b/src/media/video/video_rtp_session.h
@@ -93,8 +93,6 @@ public:
     void unbindMixer();
     void enterConference(Conference* conference);
     void exitConference();
-    void switchInput(const std::string& input) { input_ = input; }
-    const std::string& getInput() const { return input_; }
 
     void setChangeOrientationCallback(std::function<void(int)> cb);
     void initRecorder(std::shared_ptr<MediaRecorder>& rec) override;
@@ -112,7 +110,6 @@ private:
     using clock = std::chrono::steady_clock;
     using time_point = clock::time_point;
 
-    std::string input_;
     DeviceParams localVideoParams_;
 
     std::unique_ptr<VideoSender> sender_;
diff --git a/src/sip/sdp.h b/src/sip/sdp.h
index 5daf2812c7f76ce8c9f9b26a23b1c87920f0eb7b..c00f3b7fc957ed209deaae97745529ee5ebd3094 100644
--- a/src/sip/sdp.h
+++ b/src/sip/sdp.h
@@ -206,9 +206,6 @@ private:
 
     NON_COPYABLE(Sdp);
 
-    std::string getLineFromSession(const pjmedia_sdp_session* sess,
-                                   const std::string& keyword) const;
-    std::string getOutgoingVideoField(const std::string& codec, const char* key) const;
     void getProfileLevelID(const pjmedia_sdp_session* session, std::string& dest, int payload) const;
 
     /**