Cleanup

Change-Id: I1f935fca6466b0803b46ca863bef358ca8997750