simplify

Change-Id: Icd2dff124ca331935412e2653c57943b92deeea4