Remove product with refactored functions