basic cleanup and structure to add products in place