Updated to remove reference to solver.