removed unused code from eval