Remove mpdstate
Tiny changes