CLC-2289 Second followup: Be more discriminating in what we delete