Clean up

Change-Id: Idc9340a73ce8ab3d5b98d54de519fd44c0891a6f