Optimized Remove Trap