Remove clutter

Change-Id: I4d601a6f861642f5863cf1742d648488fd735c83
Merge "Remove clutter"