Workaround fix for deleting streams

Marvin isn't cascading the stream entry deletions properly, so need to "manually" delete the stream entries before deleting the stream.