WIP Cartridge Refactor - cleanup in cartridges