2nd round of disabling broken stuff in evaluations