more eval clean up