Remove trap should take detect + tinker