Alphabetize and comment out validation rules #1396