Fix trap removal