diff --git a/src/ReportBase/__init__.py b/src/ReportBase/__init__.py
index 2e14b96c2..365e2243b 100644
--- a/src/ReportBase/__init__.py
+++ b/src/ReportBase/__init__.py
@@ -27,9 +27,9 @@ __author__ =  "David R. Hampton, Donald N. Allingham"
 __version__ = "$Revision$"
 
 from _Constants import *
-from _TemplateParser import _template_map
 
 from _Report import Report
+
 from _ReportDialog import report
 from _CommandLineReport import cl_report
 from _DrawReportDialog import DrawReportDialog
diff --git a/src/docgen/LPRDoc.py b/src/docgen/LPRDoc.py
index 2ca2664e1..77f32da52 100644
--- a/src/docgen/LPRDoc.py
+++ b/src/docgen/LPRDoc.py
@@ -68,8 +68,8 @@ else:
 #
 #------------------------------------------------------------------------
 import BaseDoc
-from PluginUtils import ReportUtils, \
-     register_text_doc, register_draw_doc, register_book_doc
+from PluginUtils import register_text_doc, register_draw_doc, register_book_doc
+from ReportBase import ReportUtils
 rgb_color = ReportUtils.rgb_color
 
 #------------------------------------------------------------------------
diff --git a/src/docgen/ODFDoc.py b/src/docgen/ODFDoc.py
index 3b9e7f4b2..26858f24b 100644
--- a/src/docgen/ODFDoc.py
+++ b/src/docgen/ODFDoc.py
@@ -40,8 +40,8 @@ from math import pi, cos, sin, fabs
 #-------------------------------------------------------------------------
 import BaseDoc
 import const
-from PluginUtils import ReportUtils, \
-     register_text_doc, register_draw_doc, register_book_doc
+from PluginUtils import register_text_doc, register_draw_doc, register_book_doc
+from ReportBase import ReportUtils
 pt2cm = ReportUtils.pt2cm
 import ImgManip
 import FontScale
diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py
index 99616e0ee..e4e6fc452 100644
--- a/src/docgen/OpenOfficeDoc.py
+++ b/src/docgen/OpenOfficeDoc.py
@@ -40,8 +40,8 @@ from xml.sax.saxutils import escape
 #-------------------------------------------------------------------------
 import BaseDoc
 import const
-from PluginUtils import ReportUtils, \
-     register_text_doc, register_draw_doc, register_book_doc
+from PluginUtils import register_text_doc, register_draw_doc, register_book_doc
+from ReportBase import ReportUtils
 pt2cm = ReportUtils.pt2cm     
 import ImgManip
 import FontScale
diff --git a/src/docgen/PSDrawDoc.py b/src/docgen/PSDrawDoc.py
index 881c9f8f7..0e43e166f 100644
--- a/src/docgen/PSDrawDoc.py
+++ b/src/docgen/PSDrawDoc.py
@@ -33,7 +33,8 @@ from gettext import gettext as _
 # Gramps modules
 #
 #-------------------------------------------------------------------------
-from PluginUtils import  register_draw_doc, ReportUtils, Report
+from PluginUtils import  register_draw_doc
+from ReportBase import Report, ReportUtils
 pt2cm, rgb_color = ReportUtils.pt2cm, ReportUtils.rgb_color
 import Errors
 import BaseDoc