remove default eventing
Fixing up for 1.1