diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml
index a1f92bb8c..03eb685c6 100644
--- a/roles/usb_lib/tasks/install.yml
+++ b/roles/usb_lib/tasks/install.yml
@@ -16,6 +16,7 @@
     - { src: 'usbmount.rules.j2', dest: '/etc/udev/rules.d/usbmount.rules', mode: '0644' }
     - { src: 'iiab-usb_lib-show-all-on', dest: '/usr/bin/', mode: '0755' }
     - { src: 'iiab-usb_lib-show-all-off', dest: '/usr/bin/', mode: '0755' }
+    - { src: 'iiab-clean-usb.sh', dest: '/usr/sbin/', mode: '0755' }
 
 - name: Enable exFAT and NTFS in /etc/usbmount/usbmount.conf
   lineinfile:
diff --git a/roles/usb_lib/templates/iiab-clean-usb.sh b/roles/usb_lib/templates/iiab-clean-usb.sh
new file mode 100644
index 000000000..a1876551c
--- /dev/null
+++ b/roles/usb_lib/templates/iiab-clean-usb.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Remove symlink in /library/content to automounted usb drive
+#
+DEVICE=`echo $@ | sed -s 's|-|/|'`
+MNT_POINT=`findmnt -n /$DEVICE | awk '{print $1}'`
+CONTENT_LINK_USB=`basename $MNT_POINT | awk '{print toupper($0)}'`
+CONTENT_LINK="/library/www/html/local_content/$CONTENT_LINK_USB"
+logger -p user.notice -t "usbmount" -- "Attempting to remove link $CONTENT_LINK."
+
+if [ -L $CONTENT_LINK ]; then
+  /bin/rm $CONTENT_LINK
+  logger -p user.notice -t "usbmount" -- "$CONTENT_LINK removed."
+fi
+
diff --git a/roles/usb_lib/templates/usbmount@.service.j2 b/roles/usb_lib/templates/usbmount@.service.j2
index b8aa22387..34d75d9f3 100644
--- a/roles/usb_lib/templates/usbmount@.service.j2
+++ b/roles/usb_lib/templates/usbmount@.service.j2
@@ -4,10 +4,11 @@ After=%i.device
 After=rc-local.service
 
 [Service]
-Type=oneshot
+#Type=oneshot
 TimeoutStartSec=0
 Environment=DEVNAME=%I
 ExecStart=/usr/share/usbmount/usbmount add
-ExecStop=/bin/umount /%I
+ExecStop=/usr/sbin/iiab-clean-usb.sh %I
+ExecStopPost=/bin/umount /%I
 RemainAfterExit=yes