Merge "Return early if there are no entries to remove" into main