diff --git a/cybertools/browser/action.py b/cybertools/browser/action.py
index 128ce39..3a1b370 100644
--- a/cybertools/browser/action.py
+++ b/cybertools/browser/action.py
@@ -1,31 +1,12 @@
-#
-#  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.browser.action
 
-"""
-Base classes (sort of views) for action portlet items.
-
-$Id$
+""" Base classes (sort of views) for action portlet items.
 """
 
 from copy import copy
-from urllib import urlencode
+from urllib.parse import urlencode
 from zope import component
-from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
 
 action_macros = ViewPageTemplateFile('action_macros.pt')
diff --git a/cybertools/composer/schema/grid/field.py b/cybertools/composer/schema/grid/field.py
index be1c980..e20e5ce 100644
--- a/cybertools/composer/schema/grid/field.py
+++ b/cybertools/composer/schema/grid/field.py
@@ -1,29 +1,12 @@
-#
-#  Copyright (c) 2014 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.composer.schema.grid.field
 
-"""
-Field and field instance classes for grids.
+""" Field and field instance classes for grids.
 """
 
+import json
 from zope import component
 from zope.component import adapts
-from zope.interface import implements
-from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
 import zope.schema
 
@@ -32,7 +15,6 @@ from cybertools.composer.schema.field import Field, ListFieldInstance
 from cybertools.composer.schema.interfaces import IField, IFieldInstance
 from cybertools.composer.schema.interfaces import fieldTypes, undefined
 from cybertools.util.format import toStr, toUnicode
-from cybertools.util import json
 
 
 grid_macros = ViewPageTemplateFile('grid_macros.pt')