A little cleanup

Change-Id: Id11914d786b299312020901eb31ce3398a33ff41
Merge "A little cleanup" into jb43