Merge "Better deletions"