Revert "cleaned up events"

This reverts commit 4934ac562e6c791c381c193a63b06ec40d49d999.