Merge "Refactor Delete Anchor functionality"