diff --git a/ad_miner/sources/modules/config.json b/ad_miner/sources/modules/config.json
index 7f99571..2d35a8f 100644
--- a/ad_miner/sources/modules/config.json
+++ b/ad_miner/sources/modules/config.json
@@ -15,7 +15,6 @@
     "set_path_candidate": "true",
     "set_groups_members_count": "true",
     "set_groups_has_members": "true",
-    "set_x_nbr_adm_machines": "true",
     "set_is_group_operator": "true",
     "set_is_operator_member": "true",
     "set_is_adminsdholder": "true",
diff --git a/ad_miner/sources/modules/neo4j_class.py b/ad_miner/sources/modules/neo4j_class.py
index 922f764..d721996 100644
--- a/ad_miner/sources/modules/neo4j_class.py
+++ b/ad_miner/sources/modules/neo4j_class.py
@@ -443,6 +443,25 @@ def __init__(self, arguments, extract_date_int):
                     "filename": "set_groups_has_members",
                     "method": self.requestList,
                 },
+                # Not used anymore and possibly buggy
+                # "set_x_nbr_adm_machines": {
+                #     "name": "Set the number of machines where Computers, Users, or Groups are admin (if too long, set recursivity to 3 into the query)",
+                #     "request": "OPTIONAL MATCH (u:User) "
+                #     "WITH COLLECT (DISTINCT u) AS u1 "
+                #     "OPTIONAL MATCH (c:Computer) "
+                #     "WITH COLLECT(DISTINCT c) + u1 AS o1 "
+                #     "OPTIONAL MATCH (g:Group) "
+                #     "WITH COLLECT(DISTINCT g) + o1 AS o2 "
+                #     "UNWIND o2 AS o "
+                #     "MATCH (o) WITH o ORDER BY o.name "
+                #     "MATCH p=(o)-[:AdminTo*1..3]->(c:Computer) "
+                #     "WITH count(p) as nbr_admin, o.name as username "
+                #     "MATCH (o) "
+                #     "WHERE o.name=username "
+                #     "SET o.nbr_adm_machines=nbr_admin ",
+                #     "filename": "set_x_nbr_adm_machines",
+                #     "method": self.requestList,
+                # },
                 "set_gpo_links_count": {
                     "name": "Set the count of links/object where the GPO is applied",
                     "request": "MATCH p=(g:GPO)-[:GPLink]->(o) "