Added some more information to the unload event cleanup.