diff --git a/cybertools/container/base.py b/cybertools/container/base.py
index 03ad8ac..0b8b665 100644
--- a/cybertools/container/base.py
+++ b/cybertools/container/base.py
@@ -1,30 +1,11 @@
-#
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+# cybertools.container.base
 
-"""
-Ordered container implementation.
-
-$Id$
+""" Ordered container implementation.
 """
 
-from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
 from zope.app.container.browser.contents import JustContents
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.i18nmessageid import ZopeMessageFactory as _
 from zope.cachedescriptors.property import Lazy
 from zope.interface import Interface
 
diff --git a/cybertools/tracking/browser.py b/cybertools/tracking/browser.py
index 69e8549..65abf04 100644
--- a/cybertools/tracking/browser.py
+++ b/cybertools/tracking/browser.py
@@ -1,29 +1,10 @@
-#
-#  Copyright (c) 2010 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+# cybertools.tracking.browser
 
-"""
-View class(es) for tracking storage and tracks.
-
-$Id$
+""" View class(es) for tracking storage and tracks.
 """
 
 from zope import component
-from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
 from zope.security.proxy import removeSecurityProxy
 from zope.traversing.api import getName
diff --git a/cybertools/tracking/btree.py b/cybertools/tracking/btree.py
index e8c5b3b..79df0ce 100644
--- a/cybertools/tracking/btree.py
+++ b/cybertools/tracking/btree.py
@@ -9,8 +9,8 @@ from BTrees import OOBTree, IOBTree
 from BTrees.IFBTree import intersection, union
 from zope.component import adapter
 from zope.interface import implementer
-from zope.app.container.btree import BTreeContainer
-from zope.app.container.interfaces import IObjectRemovedEvent
+from zope.container.btree import BTreeContainer
+from zope.lifecycleevent.interfaces import IObjectRemovedEvent
 from zope.index.field import FieldIndex
 from zope.traversing.api import getParent
 from zope.traversing.interfaces import IPhysicallyLocatable
diff --git a/cybertools/tracking/logfile.py b/cybertools/tracking/logfile.py
index d66fa61..d48569c 100644
--- a/cybertools/tracking/logfile.py
+++ b/cybertools/tracking/logfile.py
@@ -1,29 +1,11 @@
-#
-#  Copyright (c) 2008 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+# cybertools.tracking.logfile
 
-"""
-Track user interactions by writing to a log file, loading the log at
+""" Track user interactions by writing to a log file, loading the log at
 certain times collecting analysis results in a real tracking storage.
-
-$Id$
 """
 
 import logging
+import logging.handlers
 import os
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 290a4a6..d65813a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,8 +13,17 @@ authors = [{name = "Helmut Merz", email = "helmutm@cy55.de"}]
 
 dependencies = [
 	"bs4",
+	"BTrees",
 	"lxml",
+	"persistent",
+	"zope.app.container",
+	"zope.browserpage",
+	"zope.component",
+	"zope.container",
+	"zope.i18nmessageid",
+	"zope.index",
 	"zope.interface",
+	"zope.lifecycleevent",
 	"zope.testing",
 ]