Code Cleanup

Change-Id: I135ef5aaa42225a22b01fbf7dc16163d3c5ebe0b