diff --git a/cluster.yml b/cluster.yml
index ebc093a215486cec1f12724413c7c3f717760448..bc0580331ab074a74d75f360bfcb9eb8310f0745 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -26,19 +26,6 @@
     - { role: kubespray-defaults}
     - { role: bootstrap-os, tags: bootstrap-os}
 
-- hosts: k8s-cluster:etcd:calico-rr
-  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  vars:
-    ansible_ssh_pipelining: true
-  gather_facts: false
-  pre_tasks:
-    - name: gather facts from all instances
-      setup:
-      delegate_to: "{{ item }}"
-      delegate_facts: true
-      with_items: "{{ groups['k8s-cluster'] + groups['etcd'] + groups['calico-rr']|default([]) }}"
-      run_once: true
-
 - hosts: k8s-cluster:etcd:calico-rr
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
   roles:
diff --git a/extra_playbooks/upgrade-only-k8s.yml b/extra_playbooks/upgrade-only-k8s.yml
index ce3927f09a6c6f1e680f701491fc759604346027..db66982cd18707d4e778889f1ff6c115e57d64dc 100644
--- a/extra_playbooks/upgrade-only-k8s.yml
+++ b/extra_playbooks/upgrade-only-k8s.yml
@@ -27,12 +27,6 @@
     - { role: kubespray-defaults}
     - { role: bootstrap-os, tags: bootstrap-os}
 
-- hosts: k8s-cluster:etcd:calico-rr
-  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  vars:
-    ansible_ssh_pipelining: true
-  gather_facts: true
-
 - hosts: k8s-cluster:etcd:calico-rr
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
   roles:
diff --git a/scale.yml b/scale.yml
index c7f3dfd31263fa1679f0b5102f580a3868a7be8c..094be2a15ab819446ca6eb091238e7410d7f8aed 100644
--- a/scale.yml
+++ b/scale.yml
@@ -27,13 +27,6 @@
     - { role: kubespray-defaults}
     - { role: bootstrap-os, tags: bootstrap-os}
 
-- name: Gather facts about our masters and etcd nodes
-  hosts: k8s-cluster:etcd:calico-rr
-  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  vars:
-    ansible_ssh_pipelining: true
-  gather_facts: true
-
 - name: Generate the etcd certificates beforehand
   hosts: etcd
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
index 1ba298e69f3664aebb095d19da8256425be2e25d..a5b2bf7811289a445e54e80fe2adf2c95f6d0d88 100644
--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -30,18 +30,6 @@
     - { role: kubespray-defaults}
     - { role: bootstrap-os, tags: bootstrap-os}
 
-- hosts: k8s-cluster:etcd:calico-rr
-  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  vars:
-    ansible_ssh_pipelining: true
-  gather_facts: true
-  pre_tasks:
-    - name: gather facts from all instances
-      setup:
-      delegate_to: "{{ item }}"
-      delegate_facts: True
-      with_items: "{{ groups['k8s-cluster'] + groups['etcd'] + groups['calico-rr']|default([]) }}"
-
 - hosts: k8s-cluster:etcd:calico-rr
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
   serial: "{{ serial | default('20%') }}"