Clean up

Change-Id: I020fc14be94e9d442ad150e5d5c31087b897f09b