added 1.18 changes to destroy-environment