WIP Cartridge Refactor - Remove support for V1 environment variables