Revert "More events added"

This reverts commit 3926824c9dab229eb8e4a86499614b3916cf906b.