removed final references to evaluator