More cleanup

Change-Id: Ib310d23d2b3ffe437b2a66bc5ee9a0478a6f8034
2 files changed