Code Cleanup

Change-Id: I2786223a0855bca1b372dcfc4d8fbc0e5c1b4eeb