Remove dependency on emitter

For not being used anywhere in the code