Remove unneccesary environment detection