Updating to remove MPD and some fluff