remove more es server remnants

some more remnants from Tampa es
servers that should have already been in
I229711a1844f9

Change-Id: Ic5a5e74936bb29e574bacc6c962559436f2d74d3