Remove env specific code