Remove infinite undertaker