Cleanup.

Change-Id: If5fc34b681615e600430478807c53f6d4440a5ec