Revert "Add event class"

This reverts commit 4b7f28a56dc44350c7508936362a88a6d2dc1bd5.