CleanUp

Change-Id: Ief34772d65ac5bf9a2dbda5ddbf059cec6be0e8b