Cleanup

Change-Id: I26d496fc0f1e1ba7814a3d7415c01258d830c5ab