Remove legacy refs