Some cleanup

Change-Id: Ie10746d2f77318d63101d919214e76f778159fa0
4 files changed