Merge pull request #10223 from lightsofapollo/clean-removal-of-events

Bug 867797 - Clean removal of events(cherry picked from commit cdeb777ff57c85fa236da621c179a1fd751cff20)