Maybe we should override unload() to do this too