diff --git a/TODO b/TODO
index c393edd2..752430b6 100644
--- a/TODO
+++ b/TODO
@@ -1,118 +1,117 @@
 
 SIP core
 --------
 
 - Cleanup Publication and Subscription to behave more like Invitation [RK]
 - Add isfocus attribute for both session parties, present in Contact header [RK]
 - Make PJSIPUA.local_ip property writable and survive IP address changes [RK]
 - Fix PJSIP problems with sending a negative reply to a re-INVITE [RK]
 - Properly split __cinit__() and __init__() methods on Cython objects [RK]
 - Make variable names consistent accross all files [RK]
 - Handle incoming SUBSCRIBE requests [RK]
 - Handle incoming REGISTER requests [RK]
 - Make MESSAGE handling a class, fix timeout [RK]
 - Handle incoming OPTIONS requests [RK]
 - Add feature to send OPTIONS method and parse the replies [RK]
 - Handle sending and receiving of multipart bodies for Invitation [RK]
 - Set list of codecs in order of preference on each AudioTransport instance,
   not at the global level [RK]
 - Use STUN to determine the public contact address used for REGISTER [RK]
 - Handle UPDATE for re-INVITE [RK]
 - Handle incoming REFER requests [RK]
-- Add TOS setting for signaling and media [RK]
 
 
 Middleware
 ----------
 
 - FileTransfer high level class [DB]
 - Desktop sharing high level class [DB]
 - MediaStream high level class [RK]
 - Conference audio sessions [RK]
 - Buddylist high-level class [LS]
 - Log XCAP messages [LS]
 - Auto SUBSCRIBE event=conference when Contact header has isfocus attribute [RK] [LS]
 - Auto PUBLISH event=presence with device status when start/end audio session [RK] [LS]
 - Auto PUBLISH event=dialog when enter/exit audio session [RK] [LS]
 - Auto ENUM lookup during session if number looks like E.164 [LS]
 - Handle 301/302 redirect [RK]
 - Detect IP address changes (OS specific) and signal Engine [RK]
 - Enrollment [LS]
 
 
 Audio
 -----
 
 - Add audio device settings for two profiles: headset and speakerphone [RK]
 - Add dummy sounds device, simulate sending RTP without audio card [RK]
 - Revise conference bridge API to support mute and multiple rooms [RK]
 - Add method to core for playing arbitrary tones on the conference bridge [RK]
 - Added general volume control for the conference bridge [RK]
 - Play a non-disruptive tone when a session is received while in another [RK]
 - Play a soft-tone while on hold every 30 seconds, use tone generator [RK]
 - Play a short tone when a session is terminated, use tone generator [RK]
 - Fix high CPU usage on OS X [RK]
 - Comfort noise generator [RK]
 - N810 maemo audio driver [LS]
 - Improve Acoustic Echo Cancellation []
 
 
 Instant messaging
 -----------------
 
 - File transfer support based on draft-ietf-mmusic-file-transfer-mech-11 [DB]
 - Use MSRPServer class to share the listening port [DB]
 - Is-composing payload [LS]
 - Fix sip_im_session to accept unicode characters [DB]
 
 
 Security and privacy
 --------------------
 
 - Off-the-Record Messaging for IM [LS]
 - zRTP for audio [RK]
 - Anonymous URI multi-party chat support [RK]
 
 
 Presence
 --------
 
 - Conference event package [LS]
 - Dialog event package http://tools.ietf.org/html/rfc4235 [LS]
 - Contact information http://tools.ietf.org/html/rfc4482 [LS]
 - Device capabilities http://tools.ietf.org/html/rfc5196 [LS]
 - xcap-diff payload [LS]
 
 
 Other applications
 ------------------
 
 - Message-summary payload [LS]
 - ENUM lookups [RK]
 - Bonjour mDNS broadcast [LS]
 
 
 Command line tools
 ------------------
 
 - Add --auto-answer and --auto-hangup parameter to sip_im_session [DB]
 - xcap_pidf_manipulation script [LS]
 - sip_subscribe_conference script [LS]
 - sip_subscribe_xcap_diff script [LS]
  
 
 Sessions
 --------
 
 - Video sessions [RK]
 - H.264 codec [RK]
 - Real Time Text (RTT) []
 
 
 Porting
 -------
 
 - Windows []
 - iPhone []
 - Symbian []