diff --git a/osm_policy_module/core/database.py b/osm_policy_module/core/database.py
index a89baed..f9a37c2 100644
--- a/osm_policy_module/core/database.py
+++ b/osm_policy_module/core/database.py
@@ -23,7 +23,7 @@
 ##
 import logging
 
-from peewee import *
+from peewee import CharField, IntegerField, ForeignKeyField, Model, TextField
 from playhouse.sqlite_ext import SqliteExtDatabase
 
 from osm_policy_module.core.config import Config
diff --git a/osm_policy_module/tests/integration/test_kafka_messages.py b/osm_policy_module/tests/integration/test_kafka_messages.py
index d17d2b2..581d53f 100644
--- a/osm_policy_module/tests/integration/test_kafka_messages.py
+++ b/osm_policy_module/tests/integration/test_kafka_messages.py
@@ -30,7 +30,6 @@
 from kafka import KafkaProducer, KafkaConsumer
 from kafka.errors import KafkaError
 
-from osm_policy_module.core.agent import PolicyModuleAgent
 from osm_policy_module.core.config import Config
 
 log = logging.getLogger()
diff --git a/osm_policy_module/tests/integration/test_policy_agent.py b/osm_policy_module/tests/integration/test_policy_agent.py
index 4de0dbb..3a82ea7 100644
--- a/osm_policy_module/tests/integration/test_policy_agent.py
+++ b/osm_policy_module/tests/integration/test_policy_agent.py
@@ -29,12 +29,12 @@
 
 from kafka import KafkaProducer
 from osm_common.dbmongo import DbMongo
-from osm_policy_module.core import database
 from peewee import SqliteDatabase
 
 from osm_policy_module.common.mon_client import MonClient
+from osm_policy_module.core import database
 from osm_policy_module.core.agent import PolicyModuleAgent
-from osm_policy_module.core.database import ScalingRecord, ScalingAlarm, BaseModel
+from osm_policy_module.core.database import ScalingRecord, ScalingAlarm
 
 log = logging.getLogger()
 log.level = logging.INFO
diff --git a/setup.py b/setup.py
index c751cbf..c3c735d 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@
     maintainer_email=_maintainer_email,
     url=_url,
     license=_license,
-    packages=setuptools.find_packages(),
+    packages=[_name],
     include_package_data=True,
     install_requires=[
         "kafka==1.3.*",
diff --git a/tox.ini b/tox.ini
index ca49be9..4ef6a64 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 [tox]
-envlist = py3, flake8
+envlist = py3
 toxworkdir={homedir}/.tox
 
 [testenv]