remove use of eval