Clean up

Change-Id: Iac5ebeb23fd4574c5f3b1580268f049d7f49b00b