Update group service to remove memory leak