Big cleanup on USB2IIC code, fix the workaround on timeout issue