From 4d3dc3475dcfb7694a73f03393f2335ecfda65ed Mon Sep 17 00:00:00 2001
From: Pascal Fischer <32096965+pascal-fischer@users.noreply.github.com>
Date: Sat, 30 Aug 2025 12:47:13 +0200
Subject: [PATCH] [management] remove duplicated removal of groups on peer
 delete (#4421)

---
 management/server/grpcserver.go | 2 --
 management/server/peer.go       | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go
index 95d4f9eee..27d54e6c2 100644
--- a/management/server/grpcserver.go
+++ b/management/server/grpcserver.go
@@ -999,8 +999,6 @@ func (s *GRPCServer) Logout(ctx context.Context, req *proto.EncryptedMessage) (*
 		return nil, mapError(ctx, err)
 	}
 
-	s.accountManager.BufferUpdateAccountPeers(ctx, peer.AccountID)
-
 	log.WithContext(ctx).Debugf("peer %s logged out successfully after %s", peerKey.String(), time.Since(start))
 
 	return &proto.Empty{}, nil
diff --git a/management/server/peer.go b/management/server/peer.go
index 8af71cbd2..3c2ebe6b6 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -368,10 +368,6 @@ func (am *DefaultAccountManager) DeletePeer(ctx context.Context, accountID, peer
 			return err
 		}
 
-		if err = transaction.RemovePeerFromAllGroups(ctx, peer.ID); err != nil {
-			return fmt.Errorf("failed to remove peer from groups: %w", err)
-		}
-
 		eventsToStore, err = deletePeers(ctx, am, transaction, accountID, userID, []*nbpeer.Peer{peer})
 		if err != nil {
 			return fmt.Errorf("failed to delete peer: %w", err)