WIP Cartridge Refactor

* Removed unused code