Remove old addHandler/removeHandler and use EventEmitter::on/EventEmitter::off