WIP Cartridge Refactor - Remove support for V1 environment variables

* Fix issue so git push updates can be made