Cleanup.

Change-Id: Ic39043d0453830d348ac3bc8a027b862e4bbdfd8