Only execute events that have not been removed. Fixes #2068.
Ensure if event is removed by user, we don't remove it.
Merge pull request #2072 from matham/events

Only execute events that have not been removed.