Remove unnecessary environment check