code cleanup

Change-Id: I2db9afce043f1447659e5999d050ee691cc0036f