Cleaned-up vars/methods of the old MPC implementation