diff --git a/homeassistant/components/light/tellstick.py b/homeassistant/components/light/tellstick.py
index c9eba19b992..a204f8e1856 100644
--- a/homeassistant/components/light/tellstick.py
+++ b/homeassistant/components/light/tellstick.py
@@ -90,5 +90,5 @@ class TellstickLight(ToggleDevice):
               last_command == tellcore_constants.TELLSTICK_UP or
               last_command == tellcore_constants.TELLSTICK_DOWN):
             last_sent_value = self.tellstick.last_sent_value()
-            if not last_sent_value is None:
+            if last_sent_value is not None:
                 self.brightness = last_sent_value
diff --git a/homeassistant/components/switch/tellstick.py b/homeassistant/components/switch/tellstick.py
index 5b3ffc85fec..29c2a2e1403 100644
--- a/homeassistant/components/switch/tellstick.py
+++ b/homeassistant/components/switch/tellstick.py
@@ -9,16 +9,6 @@ import tellcore.constants as tellcore_constants
 
 def get_devices(hass, config):
     """ Find and return Tellstick switches. """
-    return get_switches()
-
-
-def devices_discovered(hass, config, info):
-    """ Called when a device is discovered. """
-    return get_switches()
-
-
-def get_switches():
-    """ Returns the Wink switches. """
     try:
         import tellcore.telldus as telldus
     except ImportError: