Clean up some stray bits from 2108ecc

Change-Id: Ic3e24bf8eb1e39a394b081179006875f7a1cfe64