simplified

Change-Id: I5fa488db002363c3e2843a6555c5f0e90c6a47c7