Simplify

Change-Id: Ie30b96d9190fa5b70405344cf705577bff872317