Remove references to the old items, but still not to the actual items, which are removed in !1358 but this is safe to merge beforehand