CB-4917 Clean up streams