Simplification

Change-Id: I949bf3cb9c3b26a8c2de6bde20cef63d7630fc54