diff --git a/homeassistant/components/climate/generic_thermostat.py b/homeassistant/components/climate/generic_thermostat.py
index ce8217aa92c..6b7f6cb2afc 100644
--- a/homeassistant/components/climate/generic_thermostat.py
+++ b/homeassistant/components/climate/generic_thermostat.py
@@ -268,7 +268,6 @@ class GenericThermostat(ClimateDevice):
         if self._min_temp:
             return self._min_temp
 
-        # get default temp from super class
         return DEFAULT_MIN_TEMP
 
     @property
@@ -278,7 +277,6 @@ class GenericThermostat(ClimateDevice):
         if self._max_temp:
             return self._max_temp
 
-        # Get default temp from super class
         return DEFAULT_MAX_TEMP
 
     @asyncio.coroutine
diff --git a/homeassistant/components/climate/tado.py b/homeassistant/components/climate/tado.py
index c3004a0407f..59da425553a 100644
--- a/homeassistant/components/climate/tado.py
+++ b/homeassistant/components/climate/tado.py
@@ -233,7 +233,7 @@ class TadoClimate(ClimateDevice):
         """Return the minimum temperature."""
         if self._min_temp:
             return self._min_temp
-        # get default temp from super class
+
         return DEFAULT_MIN_TEMP
 
     @property
@@ -241,7 +241,7 @@ class TadoClimate(ClimateDevice):
         """Return the maximum temperature."""
         if self._max_temp:
             return self._max_temp
-        #  Get default temp from super class
+
         return DEFAULT_MAX_TEMP
 
     def update(self):
diff --git a/tests/components/climate/test_mqtt.py b/tests/components/climate/test_mqtt.py
index 677d1b944d0..663393503ac 100644
--- a/tests/components/climate/test_mqtt.py
+++ b/tests/components/climate/test_mqtt.py
@@ -9,9 +9,9 @@ from homeassistant.setup import setup_component
 from homeassistant.components import climate
 from homeassistant.const import STATE_OFF, STATE_UNAVAILABLE
 from homeassistant.components.climate import (
-    SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE,
-    SUPPORT_FAN_MODE, SUPPORT_SWING_MODE, SUPPORT_HOLD_MODE,
-    SUPPORT_AWAY_MODE, SUPPORT_AUX_HEAT, DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP)
+               SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE,
+               SUPPORT_FAN_MODE, SUPPORT_SWING_MODE, SUPPORT_HOLD_MODE,
+               SUPPORT_AWAY_MODE, SUPPORT_AUX_HEAT)
 from tests.common import (get_test_home_assistant, mock_mqtt_component,
                           fire_mqtt_message, mock_component)