cleanup emitter handling