Code cleanup

Change-Id: I390e92b4a778bd9dcde6535178c1a6b204b29fe4
3 files changed