Code Cleaning

Change-Id: I14ef075918591dccb083606628002c26807be8c4