Remove unused ProductId definition