Cleanups.

Change-Id: Id0406ddbd21aaf935ddb510c92dc752e9ee1905b