diff --git a/debian/changelog b/debian/changelog
index 9f57e33..4dd7dba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+libnymea-networkmanager (0.3.0) UNRELEASED; urgency=medium
+
+ -- Michael Zanetti <michael.zanetti@guh.io>  Sat, 21 Mar 2020 00:48:06 +0100
+
 libnymea-networkmanager (0.2.3) xenial; urgency=medium
 
   [ Simon Stürz ]
diff --git a/libnymea-networkmanager/networkmanager.cpp b/libnymea-networkmanager/networkmanager.cpp
index fee6563..a8d07af 100644
--- a/libnymea-networkmanager/networkmanager.cpp
+++ b/libnymea-networkmanager/networkmanager.cpp
@@ -350,17 +350,14 @@ bool NetworkManager::enableWireless(bool enabled)
     return m_networkManagerInterface->setProperty("WirelessEnabled", enabled);
 }
 
-bool NetworkManager::init()
+void NetworkManager::init()
 {
-    if (!m_enabled)
-        return false;
-
-    qCDebug(dcNetworkManager()) << "Initialize network manager";
+    qCDebug(dcNetworkManager()) << "Initializing network manager";
     // Check DBus connection
     if (!QDBusConnection::systemBus().isConnected()) {
         qCWarning(dcNetworkManager()) << "System DBus not connected. NetworkManagre not available.";
         setAvailable(false);
-        return false;
+        return;
     }
 
     // Create interface
@@ -370,13 +367,13 @@ bool NetworkManager::init()
         delete m_networkManagerInterface;
         m_networkManagerInterface = nullptr;
         setAvailable(false);
-        return false;
+        return;
     }
 
     qCDebug(dcNetworkManager()) << "DBus interface created successfully" << NetworkManagerUtils::networkManagerPathString();
 
     // Init properties
-    qCDebug(dcNetworkManager()) << "Read initial properties...";
+    qCDebug(dcNetworkManager()) << "Reading initial properties...";
     setVersion(m_networkManagerInterface->property("Version").toString());
     setState(static_cast<NetworkManagerState>(m_networkManagerInterface->property("State").toUInt()));
     setConnectivityState(static_cast<NetworkManagerConnectivityState>(m_networkManagerInterface->property("Connectivity").toUInt()));
@@ -384,12 +381,12 @@ bool NetworkManager::init()
     setWirelessEnabled(m_networkManagerInterface->property("WirelessEnabled").toBool());
 
     if (m_version.isEmpty()) {
-        qCWarning(dcNetworkManager()) << "Could not read initial properties. The networkmanager might not be initialized yet. Reinitialize in 2 seconds...";
+        qCWarning(dcNetworkManager()) << "Could not read initial properties. The networkmanager might not be initialized yet. Reinitializing in 2 seconds...";
         delete m_networkManagerInterface;
         m_networkManagerInterface = nullptr;
         setAvailable(false);
         QTimer::singleShot(2000, this, &NetworkManager::init);
-        return false;
+        return;
     }
 
     // Connect signals
@@ -406,12 +403,10 @@ bool NetworkManager::init()
 
     setAvailable(true);
     qCDebug(dcNetworkManager()) << "Network manager initialized successfully.";
-    qCDebug(dcNetworkManager()) << "Start initial wireless network scan...";
+    qCDebug(dcNetworkManager()) << "Starting initial wireless network scan...";
     foreach (WirelessNetworkDevice *wirelessDevice, m_wirelessNetworkDevices.values()) {
         wirelessDevice->scanWirelessNetworks();
     }
-
-    return true;
 }
 
 void NetworkManager::deinit()
@@ -645,25 +640,19 @@ void NetworkManager::onWiredDeviceChanged()
     emit wiredDeviceChanged(networkDevice);
 }
 
-bool NetworkManager::start()
+void NetworkManager::start()
 {
-    // We want the networkmanager to run, so enable it
-    m_enabled = true;
-
-    qCDebug(dcNetworkManager()) << "Start the network manager.";
     if (m_available) {
         qCDebug(dcNetworkManager()) << "Networkmanager already running.";
-        return true;
+        return;
     }
+    qCDebug(dcNetworkManager()) << "Starting the network manager.";
 
-    return init();
+    init();
 }
 
 void NetworkManager::stop()
 {
-    // We want the networkmanager to stop, so disable it
-    m_enabled = false;
-
     qCDebug(dcNetworkManager()) << "Stop the network manager.";
     if (!m_available) {
         qCDebug(dcNetworkManager()) << "Networkmanager already stopped.";
diff --git a/libnymea-networkmanager/networkmanager.h b/libnymea-networkmanager/networkmanager.h
index 00d7da0..2a469c7 100644
--- a/libnymea-networkmanager/networkmanager.h
+++ b/libnymea-networkmanager/networkmanager.h
@@ -129,7 +129,6 @@ private:
     QHash<QDBusObjectPath, WiredNetworkDevice *> m_wiredNetworkDevices;
 
     bool m_available = false;
-    bool m_enabled = false;
 
     QString m_version;
     NetworkManagerState m_state = NetworkManagerStateUnknown;
@@ -137,7 +136,7 @@ private:
     bool m_networkingEnabled = false;
     bool m_wirelessEnabled = false;
 
-    bool init();
+    void init();
     void deinit();
 
     void loadDevices();
@@ -181,7 +180,7 @@ private slots:
     void onWiredDeviceChanged();
 
 public slots:
-    bool start();
+    void start();
     void stop();
 
 };