Removing evaluators, moving evaluation methods to criteria