Improve button link cleanup