Getting rid of env-checks