Clean up EvaluationsLogic #1965

As title