Code Cleanup

Change-Id: I12c3bd4123e4d9d4a34d6796bdec45d8d97c025a