Remove non needed eval