Code Cleanup

Change-Id: Iea9dea52c62b7125df452ca9dd9acf1fa5e57166