simplified

Change-Id: I75547489246fb8a8830219b37139a098e04667e6