diff --git a/esphomeyaml/__main__.py b/esphomeyaml/__main__.py
index f0987a0913..e5c7b6ddb8 100644
--- a/esphomeyaml/__main__.py
+++ b/esphomeyaml/__main__.py
@@ -10,11 +10,9 @@ import sys
 
 from esphomeyaml import const, core_config, mqtt, platformio_api, wizard, writer, yaml_util
 from esphomeyaml.api.client import run_logs
-from esphomeyaml.components import wifi
 from esphomeyaml.config import get_component, iter_components, read_config, strip_default_ids
-from esphomeyaml.const import CONF_BAUD_RATE, CONF_DOMAIN, CONF_ESPHOMEYAML, \
-    CONF_HOSTNAME, CONF_LOGGER, CONF_MANUAL_IP, CONF_NAME, CONF_STATIC_IP, CONF_USE_CUSTOM_CODE, \
-    CONF_WIFI, CONF_BROKER
+from esphomeyaml.const import CONF_BAUD_RATE, CONF_ESPHOMEYAML, CONF_LOGGER, CONF_USE_CUSTOM_CODE, \
+    CONF_BROKER
 from esphomeyaml.core import CORE, EsphomeyamlError
 from esphomeyaml.cpp_generator import Expression, RawStatement, add, statement
 from esphomeyaml.helpers import color, indent
diff --git a/esphomeyaml/api/client.py b/esphomeyaml/api/client.py
index 58516a48bf..2708933fd2 100644
--- a/esphomeyaml/api/client.py
+++ b/esphomeyaml/api/client.py
@@ -7,7 +7,7 @@ import time
 
 # pylint: disable=unused-import
 from typing import Optional  # noqa
-from google.protobuf import message
+from google.protobuf import message  # noqa
 
 from esphomeyaml import const
 import esphomeyaml.api.api_pb2 as pb
diff --git a/esphomeyaml/core.py b/esphomeyaml/core.py
index 1ab3d6fa02..afa7a52035 100644
--- a/esphomeyaml/core.py
+++ b/esphomeyaml/core.py
@@ -6,9 +6,8 @@ import math
 import os
 import re
 
-from esphomeyaml.const import CONF_ARDUINO_VERSION, CONF_DOMAIN, CONF_ESPHOMELIB_VERSION, \
-    CONF_ESPHOMEYAML, CONF_HOSTNAME, CONF_LOCAL, CONF_MANUAL_IP, CONF_STATIC_IP, CONF_WIFI, \
-    ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266
+from esphomeyaml.const import CONF_ARDUINO_VERSION, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, \
+    CONF_LOCAL, CONF_WIFI, ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266
 from esphomeyaml.helpers import ensure_unique_string
 
 # pylint: disable=unused-import, wrong-import-order