Feature/mpd remove comments