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

This reverts commit 258db40f9850558638c0fb3addbe7a203cbb14c4.