Minor clenup

Change-Id: I9ebef1892510761de9e11024672d84183f280bb8