Remove deprecated (commented-out) code from composite-pattern objects
Fix BP bug: Didn't reset default streams upon failure