Remove and add emitter