Removed EventEmitter leak