Remove eventVendor and eventName
 - Fixes #32