Cleanup cartridge a bit