Cleanup of solve_univariate