fix some product deletion to use classes