Cleanup

Change-Id: I58701273cf0be361b2bebac2b4ca013a64df778a