lots more evaluator cleaning