diff --git a/coreapi/lsd.c b/coreapi/lsd.c
index f3a324637..b2000632d 100644
--- a/coreapi/lsd.c
+++ b/coreapi/lsd.c
@@ -61,7 +61,6 @@ struct _LinphoneSoundDaemon {
 
 static MSFilter *create_writer(MSSndCard *c){
 	LinphoneSoundDaemon *lsd=(LinphoneSoundDaemon*)c->data;
-//	MSFilter *itcsink=ms_filter_new(MS_ITC_SINK_ID);
 	MSFilter *itcsink=ms_factory_create_filter(ms_snd_card_factory_get(c), MS_ITC_SINK_ID);
 	ms_filter_call_method(itcsink,MS_ITC_SINK_CONNECT,lsd->branches[0].player);
 	return itcsink;
@@ -237,7 +236,6 @@ LinphoneSoundDaemon * linphone_sound_daemon_new(MSFactory* factory, const char *
 	
 	lsd=ms_new0(LinphoneSoundDaemon,1);
 	lsd->soundout=ms_snd_card_create_writer(card);
-//	lsd->mixer=ms_filter_new(MS_AUDIO_MIXER_ID);
 	lsd->mixer=ms_factory_create_filter(ms_snd_card_factory_get(card),MS_AUDIO_MIXER_ID);
 	lsd->out_rate=rate;
 	lsd->out_nchans=nchannels;
diff --git a/mediastreamer2 b/mediastreamer2
index 5e9a21c8d..085f64d41 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5e9a21c8dae0ff2fe62b82977dbafa3f00ca744f
+Subproject commit 085f64d41e8c6643294f6c9cb9f256ca52e9c019