simplify conditions on groups

removed some corner cases that were not used anymore