simplify AST once more, made parser work, remove in correct code