remove extra evaluate