More cleanup
Converted Cartridge to read InputStream