More cleanup

Change-Id: I61acdfd84c1958eca05437e03734581f7ace6b25
2 files changed