Yup, more cleanup.  Comes around every so often

PS2:  Just a bit more...
PS3:  And the last of it...

Change-Id: Id1da0bb19eb70c61e7cab48f34f69fe47011df0f
Merge "Yup, more cleanup.  Comes around every so often" into jb42