big cleanup and performance tuning in ContainerStreams