Cleaned up I2C issues

Cleaned up I2C issues