CB-4906 Clean up streams