Removed EventEmitter reference