Small cleanup

Change-Id: Ic712934f8763cd606fe8541379db1c2155c5598a