more product_info cleanup