Cleanup

Change-Id: I174853f244690f1bb2376034aa8e66c9ccf5dbcd