Re: [RFI] One more step for avoid obsolete references