Working on Product_Create cleanup