remove math_func and var_decl

Not sure if I am doing this right...please check