Some Trivial clean-up

Change-Id: Ie48e8f5cbc455ef267ad756d82f8c0efee0ef065