Removed TODO for event