Misc clean up

Change-Id: I2c2ed3f83e8dc02c9fe04030e1c66102e16c0b6a