Fix export creation scenario
Simplify export deletion scenario