Clean up.

Change-Id: I2e1734061d91bb1e212636576a6e83f365d7d64e