Remove grade checks from sorting logic