simplify

Change-Id: I1f44dd938bd0033ad4a5b6af4d24d1ba3e76d852