Some I2C and driver related cleanup