Remove use of eval