Remove clutter

Change-Id: Ic34d292b0b361536034bf83cef7b8cdea5ad92f7
Merge "Remove clutter"