Cleanup

Change-Id: If40e174e43bc78723d16f8bde0e5d29f711ad165