Clean-up of old ENV variables in devel & test envs