diff --git a/src/flake8/__init__.py b/src/flake8/__init__.py
index efb711c..2ecf0cd 100644
--- a/src/flake8/__init__.py
+++ b/src/flake8/__init__.py
@@ -10,22 +10,11 @@ This module
 
 """
 import logging
-try:
-    from logging import NullHandler
-except ImportError:
-    class NullHandler(logging.Handler):
-        """Shim for version of Python < 2.7."""
-
-        def emit(self, record):
-            """Do nothing."""
-            pass
 import sys
 
-LOG = logging.getLogger(__name__)
-LOG.addHandler(NullHandler())
 
-# Clean up after LOG config
-del NullHandler
+LOG = logging.getLogger(__name__)
+LOG.addHandler(logging.NullHandler())
 
 __version__ = '3.5.0'
 __version_info__ = tuple(int(i) for i in __version__.split('.') if i.isdigit())
diff --git a/tests/unit/test_setuptools_command.py b/tests/unit/test_setuptools_command.py
index 40c9733..1c52b2a 100644
--- a/tests/unit/test_setuptools_command.py
+++ b/tests/unit/test_setuptools_command.py
@@ -1,6 +1,5 @@
 """Module containing tests for the setuptools command integration."""
 import pytest
-
 from setuptools import dist
 
 from flake8.main import setuptools_command