Cleanup

Change-Id: If475305d0e9fb4fffedb5f2f1873ab2b40db3334