diff --git a/lib/connection.class.dart b/lib/connection.class.dart
index 82c0cdf..3c827c6 100644
--- a/lib/connection.class.dart
+++ b/lib/connection.class.dart
@@ -250,10 +250,16 @@ class Connection {
   }
 
   Future logout() {
-    _token = null;
-    _tempToken = null;
-    final storage = new FlutterSecureStorage();
-    return storage.delete(key: "hacl_llt");
+    Completer completer = Completer();
+    _disconnect().whenComplete(() {
+      _token = null;
+      _tempToken = null;
+      final storage = new FlutterSecureStorage();
+      storage.delete(key: "hacl_llt").whenComplete((){
+        completer.complete();
+      });
+    });
+    return completer.future;
   }
 
   Future _getLongLivedToken() {
diff --git a/lib/entity_widgets/common/camera_stream_view.dart b/lib/entity_widgets/common/camera_stream_view.dart
index 9790302..3ea95b0 100644
--- a/lib/entity_widgets/common/camera_stream_view.dart
+++ b/lib/entity_widgets/common/camera_stream_view.dart
@@ -131,7 +131,7 @@ class _CameraStreamViewState extends State<CameraStreamView> {
           .of(context)
           .entityWrapper
           .entity;
-      _webHost = HomeAssistantModel.of(context).homeAssistant.connection.httpWebHost;
+      _webHost = Connection().httpWebHost;
       _connect();
     }
 
diff --git a/lib/entity_widgets/history_chart/entity_history.dart b/lib/entity_widgets/history_chart/entity_history.dart
index 87bc416..a2ad47e 100644
--- a/lib/entity_widgets/history_chart/entity_history.dart
+++ b/lib/entity_widgets/history_chart/entity_history.dart
@@ -40,14 +40,14 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
     _needToUpdateHistory = true;
   }
 
-  void _loadHistory(HomeAssistant ha, String entityId) {
+  void _loadHistory(String entityId) {
     DateTime now = DateTime.now();
     if (_historyLastUpdated != null) {
       Logger.d("History was updated ${now.difference(_historyLastUpdated).inSeconds} seconds ago");
     }
     if (_historyLastUpdated == null || now.difference(_historyLastUpdated).inSeconds > 30) {
       _historyLastUpdated = now;
-      ha.connection.getHistory(entityId).then((history){
+      Connection().getHistory(entityId).then((history){
         if (!_disposed) {
           setState(() {
             _history = history.isNotEmpty ? history[0] : [];
@@ -68,13 +68,12 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final HomeAssistantModel homeAssistantModel = HomeAssistantModel.of(context);
     final EntityModel entityModel = EntityModel.of(context);
     final Entity entity = entityModel.entityWrapper.entity;
     if (!_needToUpdateHistory) {
       _needToUpdateHistory = true;
     } else {
-      _loadHistory(homeAssistantModel.homeAssistant, entity.entityId);
+      _loadHistory(entity.entityId);
     }
     return _buildChart();
   }
diff --git a/lib/home_assistant.class.dart b/lib/home_assistant.class.dart
index 87f3d09..0140225 100644
--- a/lib/home_assistant.class.dart
+++ b/lib/home_assistant.class.dart
@@ -2,14 +2,6 @@ part of 'main.dart';
 
 class HomeAssistant {
 
-  final Connection connection = Connection();
-
-  //bool _useLovelace = false;
-  //bool isSettingsLoaded = false;
-
-
-
-
   EntityCollection entities;
   HomeAssistantUI ui;
   Map _instanceConfig = {};
@@ -33,7 +25,6 @@ class HomeAssistant {
   String get userAvatarText => userName.length > 0 ? userName[0] : "";
   bool get isNoEntities => entities == null || entities.isEmpty;
   bool get isNoViews => ui == null || ui.isEmpty;
-  //int get viewsCount => entities.views.length ?? 0;
 
   HomeAssistant() {
     Connection().onStateChangeCallback = _handleEntityStateChange;
@@ -46,7 +37,7 @@ class HomeAssistant {
       Logger.w("Previous data fetch is not completed yet");
       return _fetchCompleter.future;
     }
-    if (entities == null) entities = EntityCollection(connection.httpWebHost);
+    if (entities == null) entities = EntityCollection(Connection().httpWebHost);
     _fetchCompleter = Completer();
     List<Future> futures = [];
     futures.add(_getStates());
@@ -72,7 +63,7 @@ class HomeAssistant {
 
   Future logout() async {
     Logger.d("Logging out...");
-    await connection.logout().then((_) {
+    await Connection().logout().then((_) {
       ui?.clear();
       entities?.clear();
       panels?.clear();
@@ -80,7 +71,7 @@ class HomeAssistant {
   }
 
   Future _getConfig() async {
-    await connection.sendSocketMessage(type: "get_config").then((data) {
+    await Connection().sendSocketMessage(type: "get_config").then((data) {
       _instanceConfig = Map.from(data);
     }).catchError((e) {
       throw {"errorCode": 1, "errorMessage": "Error getting config: $e"};
@@ -88,7 +79,7 @@ class HomeAssistant {
   }
 
   Future _getStates() async {
-    await connection.sendSocketMessage(type: "get_states").then(
+    await Connection().sendSocketMessage(type: "get_states").then(
             (data) => entities.parse(data)
     ).catchError((e) {
       throw {"errorCode": 1, "errorMessage": "Error getting states: $e"};
@@ -96,27 +87,27 @@ class HomeAssistant {
   }
 
   Future _getLovelace() async {
-    await connection.sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
+    await Connection().sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
       throw {"errorCode": 1, "errorMessage": "Error getting lovelace config: $e"};
     });
   }
 
   Future _getUserInfo() async {
     _userName = null;
-    await connection.sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) {
+    await Connection().sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) {
       Logger.w("Can't get user info: ${e}");
     });
   }
 
   Future _getServices() async {
-    await connection.sendSocketMessage(type: "get_services").then((data) => Logger.d("Services received")).catchError((e) {
+    await Connection().sendSocketMessage(type: "get_services").then((data) => Logger.d("Services received")).catchError((e) {
       Logger.w("Can't get services: ${e}");
     });
   }
 
   Future _getPanels() async {
     panels.clear();
-    await connection.sendSocketMessage(type: "get_panels").then((data) {
+    await Connection().sendSocketMessage(type: "get_panels").then((data) {
       data.forEach((k,v) {
         String title = v['title'] == null ? "${k[0].toUpperCase()}${k.substring(1)}" : "${v['title'][0].toUpperCase()}${v['title'].substring(1)}";
         panels.add(Panel(
diff --git a/lib/main.dart b/lib/main.dart
index e10cff5..89f98c7 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -288,7 +288,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
 
     _firebaseMessaging.getToken().then((String token) {
       Logger.d("Device name: ${json.encode(Connection().deviceName)}");
-      widget.homeAssistant.connection.sendHTTPPost(
+      Connection().sendHTTPPost(
           endPoint: '/api/notify.ha-client',
           data:  '{"token": "$token", "device": ${json.encode(Connection().deviceName)}}'
       ).then((_) {
@@ -310,7 +310,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
         context,
         MaterialPageRoute(
           builder: (context) => WebviewScaffold(
-            url: "${widget.homeAssistant.connection.oauthUrl}",
+            url: "${Connection().oauthUrl}",
             appBar: new AppBar(
               leading: IconButton(
                   icon: Icon(Icons.help),
@@ -342,7 +342,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
       message: "Calling $domain.$service",
       duration: Duration(seconds: 3)
     );
-    widget.homeAssistant.connection.callService(domain: domain, service: service, entityId: entityId, additionalServiceData: additionalParams).catchError((e) => _setErrorState(e));
+    Connection().callService(domain: domain, service: service, entityId: entityId, additionalServiceData: additionalParams).catchError((e) => _setErrorState(e));
   }
 
   void _showEntityPage(String entityId) {
@@ -405,7 +405,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
           new ListTile(
             leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:home-assistant")),
             title: Text("Open Web UI"),
-            onTap: () => HAUtils.launchURL(widget.homeAssistant.connection.httpWebHost),
+            onTap: () => HAUtils.launchURL(Connection().httpWebHost),
           )
       );
       menuItems.addAll([
@@ -647,7 +647,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
       child: new Text("Reload"),
       value: "reload",
     ));
-    if (widget.homeAssistant.connection.isAuthenticated) {
+    if (Connection().isAuthenticated) {
       popupMenuItems.add(
           PopupMenuItem<String>(
             child: new Text("Logout"),
diff --git a/lib/ui_class/panel_class.dart b/lib/ui_class/panel_class.dart
index d30c402..bbb1dd0 100644
--- a/lib/ui_class/panel_class.dart
+++ b/lib/ui_class/panel_class.dart
@@ -36,8 +36,7 @@ class Panel {
           )
       );
     } else {
-      HomeAssistantModel haModel = HomeAssistantModel.of(context);
-      String url = "${haModel.homeAssistant.connection.httpWebHost}/$urlPath";
+      String url = "${Connection().httpWebHost}/$urlPath";
       Logger.d("Launching custom tab with $url");
       HAUtils.launchURLInCustomTab(context, url);
     }