Fix/events

Removed the EventList object and all references to it.