Env removal timeout increased from 10 to 30 minutes