PIM-1597 Remove references to products