STREAMS-131 | Removed errant change of cleanup call location