clean up, clean up, everybody everywhere, been around too much daycare,

Change-Id: Ib9a019b8ec4265ec33c9a7eb887ffa5e58f9c5bc