simplify

Change-Id: Ifb801f04845934ce98f346bd46a81e9bf9d0ba89