Revert "Events 2. TODO"

This reverts commit e10cb3c999a9218e3077915063b0c4fb0d98ce66.