Remove eval calls
Merge pull request #618 from romainneutron/eval-remove

[3.9] Remove eval calls