Code cleanup

Change-Id: If94553894586f8745fff9952f3648160110ba609
13 files changed