cleaned evaluator, non-complete mapper