Cleanup.

Change-Id: I316a1088b9fae7cf46069eb8e5300fcb9503f163