Remove unnecessary $product_id verification