Cleanup for stopping streams
1.6.1