WIP: mpd exit cleanup