CleanUp 3

Change-Id: Iaf8b8f43c6711c72771f77aa78b73c212d31f34d