clean up Swarbhanu's fix of delte stream when data product removed bug OOIION-801