Also removes eval

(cherry picked from commit 02d1e8d3)