PLFM-2055: clean up EvaluationManager update code