Remove 1.8 only emitter