Code Cleanup

Change-Id: I6e9e8ae77fb4cf9203af48584419a56da50990bf