Delete Components and Modified AddProduct