Removed EventEmitter dependency