Code Cleanup

Change-Id: I841f4100a3ed2bf776c4cf48b1a51bfaef33c66b