Fix remove/destroy events