diff --git a/news/38.bugfix b/news/38.bugfix
new file mode 100644
index 0000000..ead4a22
--- /dev/null
+++ b/news/38.bugfix
@@ -0,0 +1,2 @@
+Remove circular dependency on Products.CMFPlone. Use moved imports from plone.base instead.
+[jensens]
diff --git a/plone/session/configure.zcml b/plone/session/configure.zcml
index 0b40a0e..844cbb2 100644
--- a/plone/session/configure.zcml
+++ b/plone/session/configure.zcml
@@ -12,7 +12,7 @@
   <include file="resources.zcml" />
   <include
       file="profiles.zcml"
-      zcml:condition="installed Products.CMFPlone"
+      zcml:condition="installed plone.base"
   />
 
 </configure>
diff --git a/plone/session/hiddenprofiles.py b/plone/session/hiddenprofiles.py
index 1068269..a950d72 100644
--- a/plone/session/hiddenprofiles.py
+++ b/plone/session/hiddenprofiles.py
@@ -1,4 +1,4 @@
-from Products.CMFPlone.interfaces import INonInstallable
+from plone.base.interfaces import INonInstallable
 from zope.interface import implementer
 
 
diff --git a/plone/session/profiles/default/registry.xml b/plone/session/profiles/default/registry.xml
index 2031f0e..f3426b8 100644
--- a/plone/session/profiles/default/registry.xml
+++ b/plone/session/profiles/default/registry.xml
@@ -6,7 +6,7 @@
   ===============================
   -->
   <records
-      interface="Products.CMFPlone.interfaces.IBundleRegistry"
+      interface="plone.base.interfaces.IBundleRegistry"
       prefix="plone.bundles/plone-session">
     <value key="enabled">True</value>
     <value key="jscompilation">++resource++plone.session.refreshsupport.js</value>
diff --git a/plone/session/profiles/uninstall/registry.xml b/plone/session/profiles/uninstall/registry.xml
index 6dfe299..f82bf15 100644
--- a/plone/session/profiles/uninstall/registry.xml
+++ b/plone/session/profiles/uninstall/registry.xml
@@ -2,7 +2,7 @@
 <registry>
 
   <records
-      interface="Products.CMFPlone.interfaces.IBundleRegistry"
+      interface="plone.base.interfaces.IBundleRegistry"
       prefix="plone.bundles/plone-session"
       remove="true">
   </records>
diff --git a/plone/session/tests/testPAS.py b/plone/session/tests/testPAS.py
index 97674f8..8872042 100644
--- a/plone/session/tests/testPAS.py
+++ b/plone/session/tests/testPAS.py
@@ -27,7 +27,6 @@ def setCookie(
 
 
 class TestSessionPlugin(unittest.TestCase):
-
     layer = PLONE_SEESION_FUNCTIONAL_TESTING
     userid = "jbloggs"
 
diff --git a/plone/session/tktauth.py b/plone/session/tktauth.py
index 85b817f..0637c09 100755
--- a/plone/session/tktauth.py
+++ b/plone/session/tktauth.py
@@ -163,7 +163,7 @@ def safe_text(value, encoding="utf-8"):
     elif isinstance(value, bytes):
         try:
             value = str(value, encoding)
-        except (UnicodeDecodeError):
+        except UnicodeDecodeError:
             value = value.decode("utf-8", "replace")
     return value
 
diff --git a/setup.py b/setup.py
index 5a10e4f..6447eeb 100644
--- a/setup.py
+++ b/setup.py
@@ -45,15 +45,11 @@
         ]
     ),
     install_requires=[
-        "AccessControl",
         "plone.keyring",
         "plone.protect",
         "Products.GenericSetup",
-        "Products.CMFPlone",
         "Products.PluggableAuthService",
         "setuptools",
-        "zope.component",
-        "zope.interface",
         "Zope",
     ],
 )