Test and fix Trigger.remove
Refactor Trigger.remove