Bug 867797 - Clean removal of events