diff --git a/fb2cal/__init__.py b/fb2cal/__init__.py
index 96dcd46..82a21e2 100644
--- a/fb2cal/__init__.py
+++ b/fb2cal/__init__.py
@@ -15,7 +15,3 @@
 """
 
 from .__meta__ import *
-from .transformer import *
-from .facebook_user import *
-from .facebook_browser import *
-from .ics_writer import *
diff --git a/fb2cal/facebook_browser.py b/fb2cal/facebook_browser.py
index 7df96e5..9778d70 100644
--- a/fb2cal/facebook_browser.py
+++ b/fb2cal/facebook_browser.py
@@ -13,7 +13,6 @@ def __init__(self):
         self.browser = mechanicalsoup.StatefulBrowser()
         self.browser.set_user_agent('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36')
         self.__cached_token = None
-        self.__cached_locale = None
 
     def authenticate(self, email, password):
         """ Authenticate with Facebook setting up session for further requests """
diff --git a/setup.cfg b/setup.cfg
index 0d9f081..20ce750 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.md
+description_file = README.md
diff --git a/setup.py b/setup.py
index 2d1546d..d1ef9f6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 from setuptools import setup, find_packages
-from fb2cal.__meta__ import __title__, __version__, __description__, __license__, __author__, __email__, __min_python_version__, __website__, __download_url__, __keywords__
+from fb2cal.__meta__ import __title__, __version__, __description__, __license__, __author__, __email__, __website__, __download_url__, __keywords__
 
 setup(
     name=__title__,
diff --git a/tests/test_ics_writer.py b/tests/test_ics_writer.py
index 9e5d3f7..c707997 100644
--- a/tests/test_ics_writer.py
+++ b/tests/test_ics_writer.py
@@ -2,7 +2,8 @@
 from ics import Calendar
 from freezegun import freeze_time
 
-from fb2cal import ICSWriter, FacebookUser
+from fb2cal.ics_writer import ICSWriter
+from fb2cal.facebook_user import FacebookUser
 
 class TestICSWriter(unittest.TestCase):
     def setUp(self):
diff --git a/tests/test_transformer.py b/tests/test_transformer.py
index 712530d..7412ef5 100644
--- a/tests/test_transformer.py
+++ b/tests/test_transformer.py
@@ -1,5 +1,5 @@
 import unittest
-from fb2cal import Transformer
+from fb2cal.transformer import Transformer
 
 from mocks.birthday_comet_root_mocks import BIRTHDAY_COMET_ROOT_JANUARY_MOCK