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

This reverts commit 43c9be6643ca5a649b04baeb23e53bc71cfe005b.