diff --git a/pkg/debug/subsystem.go b/pkg/debug/subsystem.go
index 32402279db8f..9013cf1487d5 100644
--- a/pkg/debug/subsystem.go
+++ b/pkg/debug/subsystem.go
@@ -57,11 +57,9 @@ func (s *statusFunctions) registerStatusObject(name string, obj StatusObject) er
 }
 
 func (s *statusFunctions) collectStatus() StatusMap {
-       fnCopy := functionMap{}
-
        // Make a copy to not hold the mutex while collecting the status
        s.mutex.RLock()
-       maps.Copy(fnCopy, s.functions)
+       fnCopy := maps.Clone(s.functions)
        s.mutex.RUnlock()
 
        status := StatusMap{}
diff --git a/pkg/identity/cache/local.go b/pkg/identity/cache/local.go
index cc2aff6c7a88..70f05cedf719 100644
--- a/pkg/identity/cache/local.go
+++ b/pkg/identity/cache/local.go
@@ -238,14 +238,9 @@ func (l *localIdentityCache) lookupByID(id identity.NumericIdentity) *identity.I
 
 // GetIdentities returns all local identities
 func (l *localIdentityCache) GetIdentities() map[identity.NumericIdentity]*identity.Identity {
-       cache := map[identity.NumericIdentity]*identity.Identity{}
-
        l.mutex.RLock()
        defer l.mutex.RUnlock()
-
-       maps.Copy(cache, l.identitiesByID)
-
-       return cache
+       return maps.Clone(l.identitiesByID)
 }
 
 func (l *localIdentityCache) checkpoint(dst []*identity.Identity) []*identity.Identity {
diff --git a/pkg/node/manager/rest_api.go b/pkg/node/manager/rest_api.go
index e8fa02508ed3..a37b805a3863 100644
--- a/pkg/node/manager/rest_api.go
+++ b/pkg/node/manager/rest_api.go
@@ -160,12 +160,9 @@ func (c *clusterNodesClient) NodeDelete(node nodeTypes.Node) error {
        // If the node was added/updated and removed before the clusterNodesClient
        // was aware of it then we can safely remove it from the list of added
        // nodes and not set it in the list of removed nodes.
-       found := -1
-       for i, added := range c.NodesAdded {
-               if added.Name == node.Fullname() {
-                       found = i
-               }
-       }
+       found := slices.IndexFunc(c.NodesAdded, func(added *models.NodeElement) bool {
+               return added.Name == node.Fullname()
+       })
        if found != -1 {
                c.NodesAdded = slices.Delete(c.NodesAdded, found, found+1)
        } else {