cleaned up streaming