Remove Trap - SYE-033 - Common