simplified

Change-Id: I351f83923d44aba823b9bfd245541a13351990e9