ENVY-2: cleanup wizard setup