diff --git a/qrtplib/rtpudptransmitter.h b/qrtplib/rtpudptransmitter.h
index 5ad8c04e5..3cdf8401d 100644
--- a/qrtplib/rtpudptransmitter.h
+++ b/qrtplib/rtpudptransmitter.h
@@ -325,7 +325,6 @@ public:
     RTPTransmissionInfo *GetTransmissionInfo();
     void DeleteTransmissionInfo(RTPTransmissionInfo *inf);
 
-    int GetLocalHostName(uint8_t *buffer, std::size_t *bufferlength);
     bool ComesFromThisTransmitter(const RTPAddress *addr);
     std::size_t GetHeaderOverhead()
     {
@@ -357,8 +356,8 @@ public:
     void ClearAcceptList();
     int SetMaximumPacketSize(std::size_t s);
 
-    bool NewDataAvailable();
-    RTPRawPacket *GetNextPacket();
+    bool NewDataAvailable(); // TODO: emit signal instead
+    RTPRawPacket *GetNextPacket(); // TODO: use a queue
 
 private:
     int CreateLocalIPList();
@@ -376,9 +375,8 @@ private:
     bool m_waitingfordata;
     QUdpSocket *m_rtpsock, *m_rtcpsock;
     QHostAddress m_mcastifaceIP;
-    std::list<QHostAddress> m_localIPs;
+    QHostAddress m_localIP;
     uint16_t m_rtpPort, m_rtcpPort;
-    uint8_t m_multicastTTL;
     RTPTransmitter::ReceiveMode m_receivemode;
 
     uint8_t *m_localhostname;
diff --git a/qrtplib/rtpudpv4transmitternobind.h b/qrtplib/rtpudpv4transmitternobind.h
index a1d3f4201..2ab5c238e 100644
--- a/qrtplib/rtpudpv4transmitternobind.h
+++ b/qrtplib/rtpudpv4transmitternobind.h
@@ -297,10 +297,10 @@ inline RTPUDPv4TransmissionNoBindParams::RTPUDPv4TransmissionNoBindParams() :
 class RTPUDPv4TransmissionNoBindInfo: public RTPTransmissionInfo
 {
 public:
-    RTPUDPv4TransmissionNoBindInfo(std::list<uint32_t> iplist, SocketType rtpsock, SocketType rtcpsock, uint16_t rtpport, uint16_t rtcpport) :
+    RTPUDPv4TransmissionNoBindInfo(const QHostAddress& ip, SocketType rtpsock, SocketType rtcpsock, uint16_t rtpport, uint16_t rtcpport) :
             RTPTransmissionInfo(RTPTransmitter::IPv4UDPProto)
     {
-        localIPlist = iplist;
+        localIP = ip;
         rtpsocket = rtpsock;
         rtcpsocket = rtcpsock;
         m_rtpPort = rtpport;
@@ -312,9 +312,9 @@ public:
     }
 
     /** Returns the list of IPv4 addresses the transmitter considers to be the local IP addresses. */
-    std::list<uint32_t> GetLocalIPList() const
+    QHostAddress GetLocalIP() const
     {
-        return localIPlist;
+        return localIP;
     }
 
     /** Returns the socket descriptor used for receiving and transmitting RTP packets. */
@@ -341,7 +341,7 @@ public:
         return m_rtcpPort;
     }
 private:
-    std::list<uint32_t> localIPlist;
+    QHostAddress localIP;
     SocketType rtpsocket, rtcpsocket;
     uint16_t m_rtpPort, m_rtcpPort;
 };