Remove ExprEvalutor references