Revert "Simplify finalizeUnload, remove first. No reason to delay and cause a race condition, not sure what I was thinking." - now I know what I was thinking! :p

This reverts commit 2e66990a6998e6e0e14af850146bcc183d4acea8.