diff --git a/homeassistant/components/homematic.py b/homeassistant/components/homematic.py
index 5c23462e98d..749f372596b 100644
--- a/homeassistant/components/homematic.py
+++ b/homeassistant/components/homematic.py
@@ -17,11 +17,10 @@ import time
 import logging
 from functools import partial
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, \
-    ATTR_DISCOVERED, \
+    ATTR_DISCOVER_DEVICES, \
     STATE_UNKNOWN
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
-import homeassistant.bootstrap
 
 DOMAIN = 'homematic'
 REQUIREMENTS = ['pyhomematic==0.1.6']
diff --git a/homeassistant/components/thermostat/homematic.py b/homeassistant/components/thermostat/homematic.py
index e654379d56e..d7675a5cd47 100644
--- a/homeassistant/components/thermostat/homematic.py
+++ b/homeassistant/components/thermostat/homematic.py
@@ -38,6 +38,7 @@ def setup_platform(hass, config, add_callback_devices, discovery_info=None):
                                                   add_callback_devices)
 
 
+# pylint: disable=abstract-method
 class HMThermostat(homematic.HMDevice, ThermostatDevice):
     """Represents a Homematic Thermostat in Home Assistant."""