Get rid of legacy `es` references