Added stuff to remove from Unload.