Cleanup Stream interface