minor cleanup

Change-Id: I891e73f8fe0616b2a69657cfbd9ac034f96ab97a