Remove more mpdecision cruft