Patches nightly problem by adding explicit predicates

Adds explicit predicates in stream_definition cleanup