remove the emitter file and various tweaks