code cleanup

Change-Id: I2b6fe6853654df813726e6239df2c0d68f5b270c