Revert "Improve eventFire and byclass functions"

This reverts commit 48fef0a8c5bbfb26e626647f9514ef76dcfeb194.