removed old Evaluator code