diff --git a/homeassistant/components/light/tellstick.py b/homeassistant/components/light/tellstick.py
index 32fee78e305..3f7002b5b03 100644
--- a/homeassistant/components/light/tellstick.py
+++ b/homeassistant/components/light/tellstick.py
@@ -34,9 +34,11 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 
     for switch in switches_and_lights:
         if switch.methods(tellcore_constants.TELLSTICK_DIM):
-            lights.append(TellstickLight(switch, core))
+            lights.append(TellstickLight(switch))
 
+    # pylint: disable=unused-argument
     def _device_event_callback(id_, method, data, cid):
+        """ Called from the TelldusCore library to update one device """
         for light_device in lights:
             if light_device.tellstick_device.id == id_:
                 light_device.update_ha_state(True)
@@ -54,7 +56,7 @@ class TellstickLight(Light):
                               tellcore_constants.TELLSTICK_UP |
                               tellcore_constants.TELLSTICK_DOWN)
 
-    def __init__(self, tellstick_device, core):
+    def __init__(self, tellstick_device):
         self.tellstick_device = tellstick_device
         self.state_attr = {ATTR_FRIENDLY_NAME: tellstick_device.name}
         self._brightness = 0
diff --git a/homeassistant/components/switch/tellstick.py b/homeassistant/components/switch/tellstick.py
index a61cc8db28b..8f0150543de 100644
--- a/homeassistant/components/switch/tellstick.py
+++ b/homeassistant/components/switch/tellstick.py
@@ -48,7 +48,9 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
             switches.append(
                 TellstickSwitchDevice(switch, signal_repetitions))
 
+    # pylint: disable=unused-argument
     def _device_event_callback(id_, method, data, cid):
+        """ Called from the TelldusCore library to update one device """
         for switch_device in switches:
             if switch_device.tellstick_device.id == id_:
                 switch_device.update_ha_state(True)