Clean up

Change-Id: I7cb94aee133aa89f4252e897b3c3ac063c6ffffe
Simplify

Change-Id: Ie30b96d9190fa5b70405344cf705577bff872317