product/product clean-up