Code Cleanup

Change-Id: I48b321bbabcfbd64e4711736dd8c652e74a72d52