EquationEvaluator Cleanup