more cleanup of prob_solve