Some more removal from the old MPS solver