Removed DefaultEventListener (now unnecessary)