More emitter cleanup