diff --git a/FORMULAS.yaml b/FORMULAS.yaml
index 7a42838..781bb37 100644
--- a/FORMULAS.yaml
+++ b/FORMULAS.yaml
@@ -1,5 +1,4 @@
 ---
-dhcpd: {}
 elasticsearch:
   namespace: 'cboltz'
   pending:
@@ -27,6 +26,5 @@ sssd:
   prefix: 'salt-'
 sudoers: {}
 timezone: {}
-users: {}
 zypper:
   namespace: 'tampakrap'
diff --git a/pillar/role/saltmaster.sls b/pillar/role/saltmaster.sls
index deef0ca..3755aea 100644
--- a/pillar/role/saltmaster.sls
+++ b/pillar/role/saltmaster.sls
@@ -25,7 +25,6 @@ salt:
           - root: salt
           - privkey: /var/lib/salt/.ssh/salt_gitlab_ioo_infra_salt
           - pubkey: /var/lib/salt/.ssh/salt_gitlab_ioo_infra_salt.pub
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/dhcpd-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/elasticsearch-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/grains-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/keepalived-formula.git
@@ -42,7 +41,6 @@ salt:
       - https://gitlab.infra.opensuse.org/saltstack-formulas/sssd-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/sudoers-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/timezone-formula.git
-      - https://gitlab.infra.opensuse.org/saltstack-formulas/users-formula.git
       - https://gitlab.infra.opensuse.org/saltstack-formulas/zypper-formula.git
     gitfs_ssl_verify: True
     hash_type: sha512