diff --git a/XIONControlPanel/Controllers/MainViewController.swift b/XIONControlPanel/Controllers/MainViewController.swift
index 1c5516c..e18b069 100644
--- a/XIONControlPanel/Controllers/MainViewController.swift
+++ b/XIONControlPanel/Controllers/MainViewController.swift
@@ -130,7 +130,6 @@ class MainViewController: UIViewController, SwitchesViewControllerDelegate {
         _updateVisualization(true)
         
         for device in devices {
-            // WARNING: don't commit
             _server.toggleDevice(device, state: device.state, completion: { (error: NSError?) -> Void in })
         }
     }
@@ -170,7 +169,6 @@ class MainViewController: UIViewController, SwitchesViewControllerDelegate {
                 } else {
                     self.devices = []
                     self._updateConnectivityStatus(.Error)
-                    self._stopUpdatingDevices()
                 }
             }
         })