some more cleanup of the evaluator