Remove from eval.c