Remove group-related fields