EventEmitter Class cleanup