WIP remove some product dependencies to localize the Update Problem