Code Cleanup

Change-Id: I030fe259de8697715f1a5d40fb2cf4fbf01c7e17