simplified

Change-Id: Ia70d34cfe3b69581f9c7628446d897ff0a519581