simplify

Change-Id: I5bf9b365fe4bd250dcd0f0dfec5f3a7f04a09a97