Revert "Fixed sorting issue, which introduced new untested code"

This reverts commit 8ecb2bcdf5a04e7301bbb4bf101569477fb9d484.
Mass updates to remove Division Groups from Code