Fix trap removal
Merge pull request #115 from brandonbloom/noshow-timeout

Fix trap removal