Remove EventEmitter and improvements.