Nozomi: cleanup

Change-Id: I2964139ef71a740211232eb2e220cf98f86f2727