Fixing scenario and product removal.