Cleanup

Change-Id: cb5b3003ea
Story-Id: unassigned