Cleaned-up methods/vars for the old MPC solver