Removing name and event_vendor arguments as in issue #19