Remove env specific issues