Refactor events to exclude

[#47850897]