Removed z3 dependent code