clean up the Evaluator some more