simplify

Change-Id: I83267c05a4d238b71cbf28492d84e1e8587b4679