Removed traces of event management properly