Ellis or Navarro to go when Barajas returns