diff --git a/roles/usb_lib/templates/iiab-clean-usb.sh b/roles/usb_lib/files/usbmount/iiab-clean-usb.sh
similarity index 65%
rename from roles/usb_lib/templates/iiab-clean-usb.sh
rename to roles/usb_lib/files/usbmount/iiab-clean-usb.sh
index cff4ce72d..ee4eee19b 100644
--- a/roles/usb_lib/templates/iiab-clean-usb.sh
+++ b/roles/usb_lib/files/usbmount/iiab-clean-usb.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 # Remove symlink in /library/www/html/local_content to automounted USB drive
+# exported
+#UM_DEVICE="$DEVNAME"
+#UM_MOUNTPOINT="$mountpoint"
+#UM_FILESYSTEM="$fstype"
 
-DEVICE="/$(echo $1 | sed 's|-|/|')"
-MNT_POINT=$(findmnt -no target $DEVICE)
-CONTENT_LINK_USB=$(basename $MNT_POINT | awk '{print toupper($0)}')
+#DEVICE="/$(echo $1 | sed 's|-|/|')"
+#MNT_POINT=$(findmnt -no target $DEVICE)
+CONTENT_LINK_USB=$(basename "$UM_MOUNTPOINT" | awk '{print toupper($0)}')
 CONTENT_LINK="/library/www/html/local_content/$CONTENT_LINK_USB"
 
 logger -t "usbmount (iiab-clean-usb.sh)" "Attempting to remove symlink $CONTENT_LINK, as auto-created earlier by usb_lib."
diff --git a/roles/usb_lib/files/usbmount/usbmount b/roles/usb_lib/files/usbmount/usbmount
index 74cbc6a3a..e1cb60bcc 100644
--- a/roles/usb_lib/files/usbmount/usbmount
+++ b/roles/usb_lib/files/usbmount/usbmount
@@ -215,15 +215,14 @@ elif [ "$1" = remove ]; then
         # If the mountpoint and filesystem type are maintained by
         # this script, unmount the filesystem.
         if in_list "$mountpoint" "$MOUNTPOINTS"; then
-            log info "executing command: umount -l $mountpoint"
-            umount -l "$mountpoint"
-
             # Run hook scripts; ignore errors.
             export UM_DEVICE="$DEVNAME"
             export UM_MOUNTPOINT="$mountpoint"
             export UM_FILESYSTEM="$fstype"
             log info "executing command: run-parts /etc/usbmount/umount.d"
             run-parts /etc/usbmount/umount.d || :
+            log info "executing command: umount -l $mountpoint"
+            umount -l "$mountpoint"
         fi
         break
     fi
diff --git a/roles/usb_lib/templates/usbmount.rules.j2 b/roles/usb_lib/files/usbmount/usbmount.rules
similarity index 100%
rename from roles/usb_lib/templates/usbmount.rules.j2
rename to roles/usb_lib/files/usbmount/usbmount.rules
diff --git a/roles/usb_lib/templates/usbmount@.service.j2 b/roles/usb_lib/files/usbmount/usbmount@.service
similarity index 100%
rename from roles/usb_lib/templates/usbmount@.service.j2
rename to roles/usb_lib/files/usbmount/usbmount@.service
diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml
index 660df7eb2..cac0c3d58 100644
--- a/roles/usb_lib/tasks/install.yml
+++ b/roles/usb_lib/tasks/install.yml
@@ -93,16 +93,9 @@
   with_items:
     - { src: 'usbmount/usbmount.conf', dest: '/etc/usbmount/', mode: '0644' }
     - { src: 'usbmount/usbmount', dest: '/usr/local/sbin/', mode: '0755' }
-
-- name: 'Install from template: /etc/udev/rules.d/usbmount.rules, /etc/systemd/system/usbmount@.service, /usr/local/sbin/iiab-clean-usb.sh'
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    mode: "{{ item.mode }}"
-  with_items:
-    - { src: 'usbmount.rules.j2', dest: '/etc/udev/rules.d/usbmount.rules', mode: '0644' }
-    - { src: 'usbmount@.service.j2', dest: '/etc/systemd/system/usbmount@.service', mode: '0644' }
-    - { src: 'iiab-clean-usb.sh', dest: '/usr/local/sbin/', mode: '0755' }
+    - { src: 'usbmount/usbmount.rules', dest: '/etc/udev/rules.d/usbmount.rules', mode: '0644' }
+    - { src: 'usbmount/usbmount@.service', dest: '/etc/systemd/system/usbmount@.service', mode: '0644' }
+    - { src: 'usbmount/iiab-clean-usb.sh', dest: '/etc/usbmount/umount.d/iiab-clean-usb.sh', mode: '0755' }
 
 - name: Add dir {{ doc_root }}/upload2usb (0775) owned by {{ apache_user }}:{{ apache_user }}
   file: