We were checking for an empty group before. Is this not necessary anymore?