removed some sympy stuff
merge