simplified

Change-Id: I23e7272b5b1a11b7fffd3005e418b1687d41de50