simplify

Change-Id: I6cb7c66a8dbac1a887d4f218f5de9d73310c809b