Cleanup uses of groupsMode
#MBL-10514 Code Review