diff --git a/optimizely/bucketer.py b/optimizely/bucketer.py
index 4815625e..221e2f16 100644
--- a/optimizely/bucketer.py
+++ b/optimizely/bucketer.py
@@ -17,7 +17,6 @@
 except ImportError:
   from .lib import pymmh3 as mmh3
 
-from .helpers import enums
 
 MAX_TRAFFIC_VALUE = 10000
 UNSIGNED_MAX_32_BIT_VALUE = 0xFFFFFFFF
diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py
index 854dd78d..6b775146 100644
--- a/optimizely/optimizely.py
+++ b/optimizely/optimizely.py
@@ -10,8 +10,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import logging
-
 from . import decision_service
 from . import entities
 from . import event_builder
@@ -399,9 +397,6 @@ def is_feature_enabled(self, feature_key, user_id, attributes=None):
       if decision.variation.featureEnabled:
         self.logger.info('Feature "%s" is enabled for user "%s".' % (feature_key, user_id))
         return True
-      else:
-        self.logger.info('Feature "%s" is not enabled for user "%s".' % (feature_key, user_id))
-        return False
 
     self.logger.info('Feature "%s" is not enabled for user "%s".' % (feature_key, user_id))
     return False
diff --git a/tests/test_bucketing.py b/tests/test_bucketing.py
index 4895ad14..a09fba7b 100644
--- a/tests/test_bucketing.py
+++ b/tests/test_bucketing.py
@@ -20,7 +20,6 @@
 from optimizely import entities
 from optimizely import logger
 from optimizely import optimizely
-from optimizely.helpers import enums
 from optimizely.lib import pymmh3
 
 from . import base
diff --git a/tests/test_event_builder.py b/tests/test_event_builder.py
index 63d353e5..9334e6db 100644
--- a/tests/test_event_builder.py
+++ b/tests/test_event_builder.py
@@ -15,9 +15,7 @@
 import unittest
 
 from optimizely import event_builder
-from optimizely import exceptions
 from optimizely import version
-from optimizely.helpers import enums
 from . import base
 
 
diff --git a/tests/test_optimizely.py b/tests/test_optimizely.py
index fcc57743..dd25aa70 100644
--- a/tests/test_optimizely.py
+++ b/tests/test_optimizely.py
@@ -23,9 +23,8 @@
 from optimizely import optimizely
 from optimizely import project_config
 from optimizely import version
-from optimizely.logger import SimpleLogger
-from optimizely.notification_center import NotificationCenter
 from optimizely.helpers import enums
+from optimizely.notification_center import NotificationCenter
 from . import base