Removed environment variable check