Cartridge - Clean up manifests

* Add missing elements or remove unused elements