Remove plugin specific envs, fix up others