added destroy to event handler
Merge branch 'destroy-event-handler'