A little cleanup
A little cleanup


Former-commit-id: f9de26b44e8639b372bac112dcf4bb681f02efa1 [formerly ae18a6337ba1bf3e42c19f243281c8869a9ff737]
Former-commit-id: 0efe3bf3899f207d7c5cb58433ad3fc4425ecd0f
dpwolfe/otucha,dpwolfe/otucha,dpwolfe/otucha