clean up a few further things

Change-Id: I48e112349616a26a0d96823cadb02d80c33b6f3b
fix some things that got screwed up by the cleaning

Change-Id: I4ccc4948f5b87db22b252ff9e596630303148e2e