a bit of mdp cleanup, though the current model is still\ failing.