changed some ValueError to NotImplementedError
solve_univariate: removed simplify call