diff --git a/pylintrc b/pylintrc
index f30419087..4ad166c49 100644
--- a/pylintrc
+++ b/pylintrc
@@ -5,8 +5,11 @@
 # I0011 Warning locally suppressed using disable-msg
 # W0511 fixme
 disable=C0111,C0103,I0011,W0511
+[VARIABLES]
+# Tells whether we should check for unused import in __init__ files.
+init-import=yes
 [DESIGN]
 # Maximum number of locals for function / method body
 max-locals=25
 # Maximum number of branch for function / method body
-max-branches=20
\ No newline at end of file
+max-branches=20
diff --git a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/__init__.py b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/__init__.py
index ddd31488d..bb68a0b1c 100644
--- a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/__init__.py
+++ b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/__init__.py
@@ -4,10 +4,10 @@ import pip
 from six.moves import input #pylint: disable=redefined-builtin
 
 from azure.cli.parser import IncorrectUsageError
-from azure.cli.commands import CommandTable, COMMON_PARAMETERS
+from azure.cli.commands import CommandTable
 from azure.cli._locale import L
 
-from azure.cli.utils.update_checker import check_for_component_update, UpdateCheckError
+from azure.cli.utils.update_checker import check_for_component_update
 
 CLI_PACKAGE_NAME = 'azure-cli'
 COMPONENT_PREFIX = 'azure-cli-'
diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py
index ed1b28c73..c15bffaa1 100644
--- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py
+++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/__init__.py
@@ -1,4 +1,3 @@
-import time
 from azure.mgmt.network import NetworkManagementClient, NetworkManagementClientConfiguration
 from azure.mgmt.network.operations import (ApplicationGatewaysOperations,
                                            ExpressRouteCircuitAuthorizationsOperations,
diff --git a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/__init__.py b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/__init__.py
index 2d1d7af8f..73f6919d3 100644
--- a/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/__init__.py
+++ b/src/command_modules/azure-cli-profile/azure/cli/command_modules/profile/__init__.py
@@ -1,6 +1,6 @@
-import azure.cli.command_modules.profile.account
-import azure.cli.command_modules.profile.login
-import azure.cli.command_modules.profile.logout
-from azure.cli.command_modules.profile.command_tables import COMMAND_TABLES, generate_command_table
+import azure.cli.command_modules.profile.account #pylint: disable=unused-import
+import azure.cli.command_modules.profile.login #pylint: disable=unused-import
+import azure.cli.command_modules.profile.logout #pylint: disable=unused-import
+from azure.cli.command_modules.profile.command_tables import generate_command_table
 
 command_table = generate_command_table()
diff --git a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py
index 2f9e27aea..690867d3a 100644
--- a/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py
+++ b/src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py
@@ -1,5 +1,4 @@
 from __future__ import print_function
-import os
 from sys import stderr
 
 from azure.storage.blob import PublicAccess, BlockBlobService, AppendBlobService, PageBlobService