Simplify

Change-Id: I9857afc5dd6652fc28be00bea81ad213712b3dc5