Temporarily remove adding the survey validator