We no longer use the mode repair.

Fix evaluators