diff --git a/CICD/master_playbook.yml b/CICD/master_playbook.yml
index 07cd51e8647893c94c37c9d83a386e27be446998..c4419b3e0f6bc5c55a152f7d909bc00d31ceeffe 100644
--- a/CICD/master_playbook.yml
+++ b/CICD/master_playbook.yml
@@ -1,6 +1,4 @@
 ---
-- import_playbook: plays/make_files.yml
-  tags: [make_files]
 - import_playbook: plays/allnodes.yml
   tags: [allnodes]
 - import_playbook: plays/init_slurmconf.yml # this requires management nodes
diff --git a/CICD/plays/allnodes.yml b/CICD/plays/allnodes.yml
index 4aaa58b143158cc4704ed5e04c0bbc72c103b624..01657af7ca5b935140d3b16dbbfcb46c2dfed6fc 100644
--- a/CICD/plays/allnodes.yml
+++ b/CICD/plays/allnodes.yml
@@ -2,7 +2,7 @@
   vars_files:
   - vars/passwords.yml
   - vars/names.yml
-  - vars/ldapConfig.yml
+    #  - vars/ldapConfig.yml
   - vars/filesystems.yml
   - vars/slurm.yml
   - vars/vars.yml
@@ -15,7 +15,6 @@
   vars_files:
   - vars/passwords.yml
   - vars/names.yml
-  - vars/ldapConfig.yml
   - vars/filesystems.yml
   - vars/slurm.yml
   - vars/vars.yml
@@ -26,29 +25,21 @@
   - { role: etcHosts, tags: [ networking ] }
   - { role: config_repos, tags: [ repos ] }
   - { role: upgrade, tags: [ upgrade ]}
-  - { role: set_password }
-  - { role: ntp }
-  - { role: set_timezone }
   - { role: logrotate, tags: [ logrotate, other ] }
-  - { role: disableIPv6, tags: [ disableipv6, networking ] }
 
 - hosts: 'DesktopNodes,ComputeNodes,LoginNodes,ManagementNodes'
   vars_files:
   - vars/passwords.yml
   - vars/names.yml
-  - vars/ldapConfig.yml
   - vars/filesystems.yml
   - vars/slurm.yml
   - vars/vars.yml
   strategy: free
   roles:
   - { role: disable_selinux, tags: [ disableselinux ] }
-  #- { role: ldapclient, tags: [ authentication ] }
   - { role: ssh-password-login, tags: [ authentication ] }
   - { role: enable_sudo_group, tags: [ authentication, sudo ] }
   - { role: move_homedir }
   - { role: calculateKnownHosts, tags: [ calculateKnownHosts ] }
   - { role: SSHKnownHosts, tags: [ known_hosts ] }
-  - { role: hpcid_ca, tags: [ certificateAuthority ] } # this should be removed for/by collaborators
-  - { role: jasons_ssh_ca, tags: [ ssh_ca ] }
 
diff --git a/CICD/plays/mgmtnodes.yml b/CICD/plays/mgmtnodes.yml
index 9aee41f94f94cc53a7b08696f13bd250574c2d76..4a23f42ff2f5772341ad58f84188f0be06c1d659 100644
--- a/CICD/plays/mgmtnodes.yml
+++ b/CICD/plays/mgmtnodes.yml
@@ -35,7 +35,6 @@
 #  - { role: ssh-password-login }
 #  - { role: enable_sudo_group }
 
-  - { role: nfs-client, nfsMounts: "{{ mgmtNfsMounts }}", tags: [ nfs ] }
   - { role: slurmdb-config, tags: [ slurm, slurmdb-config ] }
   - { role: slurm-common, tags: [ slurm, slurm-common ]  }
   - { role: slurm_config, tags: [ slurm, slurm-config ] }
diff --git a/CICD/plays/nfssqlnodes.yml b/CICD/plays/nfssqlnodes.yml
index 1bd0ed32c5dedb82347211de949511b7563012dc..88402415cc710ca63fca86c934fd051439d49dc5 100644
--- a/CICD/plays/nfssqlnodes.yml
+++ b/CICD/plays/nfssqlnodes.yml
@@ -47,42 +47,10 @@
   gather_facts: True
   roles:
   - { role: upgrade, tags: [ upgrade ] }
-  - { role: make_filesystems, volumes: "{{ dbvolumes }}" }
   - { role: mysql, mysql_type: mysql_server,  mysql_root_password: "{{ sqlrootPasswd }}", mysql_user_name: slurmdb, mysql_user_db_name: slurm_acct_db, mysql_user_hosts_group: "{{ groups['ManagementNodes'] }}", mysql_user_password: "{{ slurmdb_passwd }}", tags: [ database ] }
   - { role: slurm-mysql-config, tags: [database,slurmdb] }
   tags: [ sql ]
 
-- hosts: 'NFSNodes'
-  vars_files:
-  - vars/passwords.yml
-  - vars/names.yml
-  - vars/ldapConfig.yml
-  - vars/filesystems.yml
-  - vars/slurm.yml
-  - vars/vars.yml
-  strategy: free
-  gather_facts: False
-  roles:
-  - { role: make_filesystems, volumes: "{{ nfsvolumes }}" }
-  tasks:
-  - { name: make homedir, file: { path: /nfsvol/home, state: directory }, become: true, become_user: root }
-  - { name: make projects, file: { path: /nfsvol/projects, state: directory }, become: true, become_user: root }
-  - { name: make projects, file: { path: /nfsvol/scratch, state: directory }, become: true, become_user: root }
-  tags: [ nfs ]
-
-- hosts: 'NFSNodes'
-  strategy: free
-  gather_facts: False
-  vars_files:
-  - vars/passwords.yml
-  - vars/names.yml
-  - vars/ldapConfig.yml
-  - vars/filesystems.yml
-  - vars/slurm.yml
-  - vars/vars.yml
-  roles:
-  - { role: nfs-server }
-  tags: [ nfs,nfs-server ]
 
 - hosts: 'LogNodes'
   roles: