Unnecessary
Refactored to event emitter