created new patch for bug fix and more targeted remove button (for real this time)