cleanup; fix things broken by new evaluator