diff --git a/playbook/cvl2.yml b/playbook/cvl2.yml
index a7fa28438097b02e9c33a10106af9cbd20d793cd..aacaa83afcdd182b81c2258a598d8b961e38e6a5 100644
--- a/playbook/cvl2.yml
+++ b/playbook/cvl2.yml
@@ -25,11 +25,11 @@
       - {name: dev, group: ComputeNodesDebug, default: false}
       - {name: multicore, group: ComputeNodesLarge, default: false}
     mkFileSystems:
-        - {fstype : 'ext4', dev: '/dev/vdc1', opts: '', name: '/scrach'}
-        - {fstype : 'ext4', dev: '/dev/vdc2', opts: '', name: '/cvl_home'}
-        - {fstype : 'ext4', dev: '/dev/vdc3', opts: '', name: '/usr/local'}
+        - {fstype : 'ext4', dev: '/dev/vdc1', opts: ''}
+        - {fstype : 'ext4', dev: '/dev/vdc2', opts: ''}
+        - {fstype : 'ext4', dev: '/dev/vdc3', opts: ''}
     mountFileSystems:
-        - {fstype : 'ext4', dev: '/dev/vdc1', opts: 'defaults,nofail', name: '/scrach'}
+        - {fstype : 'ext4', dev: '/dev/vdc1', opts: 'defaults,nofail', name: '/scratch'}
         - {fstype : 'ext4', dev: '/dev/vdc2', opts: 'defaults,nofail', name: '/cvl_home'}
         - {fstype : 'ext4', dev: '/dev/vdc3', opts: 'defaults,nofail', name: '/usr/local'}
   roles:
@@ -41,8 +41,6 @@
     - { role: nfs-server, configDiskDevice: true }
     - { role: slurm, slurm_use_vpn: true}
     - { role: installPackage, yumGroupPackageList: ['CVL Pre-installation', 'CVL Base Packages'], cliCopy: {'run': 'cp -r /usr/local/Modules/modulefiles/cvl /usr/local/Modules/modulefiles/massive', 'check': '/usr/local/Modules/modulefiles/massive'} }
-  tasks:
-    setup:
 
 - hosts: all 
   vars_files:
diff --git a/roles/easy-rsa-common/tasks/yumList.yml b/roles/easy-rsa-common/tasks/yumList.yml
index fe7e95dea0716407b5be2c55f82cc9aa6b1bfe01..b3e4cb0d60bedb351090c75a0c3839079bd096bb 100644
--- a/roles/easy-rsa-common/tasks/yumList.yml
+++ b/roles/easy-rsa-common/tasks/yumList.yml
@@ -10,3 +10,4 @@
     - openssl-devel
     - nfs-utils
   yum: "name={{ item }} state=present"
+  sudo: true
diff --git a/roles/nfs-server/tasks/main.yml b/roles/nfs-server/tasks/main.yml
index 3e60a572484f4ba692e7884469d80acc1315f1de..29b98a51f78f9679387544cdcec27a1711a2383d 100644
--- a/roles/nfs-server/tasks/main.yml
+++ b/roles/nfs-server/tasks/main.yml
@@ -1,4 +1,3 @@
 ---
 - include: mkFilesystem.yml 
-- include: fileSymbolicLink.yml
 - include: startServer.yml
diff --git a/roles/nfs-server/tasks/mkFilesystem.yml b/roles/nfs-server/tasks/mkFilesystem.yml
index 08904147978ca94d1d4f25be7cb1621be9e10607..b25a554d6960ca9736a1dcee46ec0d08276a9eff 100644
--- a/roles/nfs-server/tasks/mkFilesystem.yml
+++ b/roles/nfs-server/tasks/mkFilesystem.yml
@@ -3,11 +3,11 @@
   filesystem: fstype={{ item.fstype }} dev={{ item.dev }} opts={{ item.opts }}
   with_items: mkFileSystems
   sudo: true
-  when: configDiskDevice or mkFileSystems is defined
+  when: mkFileSystems is defined
 
 - name: Mount device 
   mount: name={{ item.name }} src={{ item.dev }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted
   with_items: mountFileSystems
   sudo: true
-  when: configDiskDevice or mountFileSystems is defined
+  when: mountFileSystems is defined