Remove EvaluationOptimization