use triggerHandler rather than trigger for remove event
Merged PR#424