remove emitter reliance, dunno why this wasnt done in the first place