Add more cleanup when unsetting environnement