Code cleanup

Change-Id: If92e3addfc4d8546a60edcdea60a1fc89c27b680
3 files changed