Removed all code related to event management