minor cleanup

Change-Id: I0647be72fa602e8758e403c61baaff66fddb7a94