remove es[123] for decom

Change-Id: I11c473df759f307c83dbcecef061df6f4c796491