diff --git a/cscripts/__init__.py.in b/cscripts/__init__.py.in
index 1acdce3..c4e433b 100644
--- a/cscripts/__init__.py.in
+++ b/cscripts/__init__.py.in
@@ -50,20 +50,6 @@ if cur_version > req_version:
 
 
 # Import
-#from @PYTHON_RELATIVE_IMPORT@cscaldb      import cscaldb
-#from @PYTHON_RELATIVE_IMPORT@csinfo       import csinfo
-#from @PYTHON_RELATIVE_IMPORT@cslightcrv   import cslightcrv
-#from @PYTHON_RELATIVE_IMPORT@csmodelinfo  import csmodelinfo
-#from @PYTHON_RELATIVE_IMPORT@csmodelmerge import csmodelmerge
-#from @PYTHON_RELATIVE_IMPORT@csobs2caldb  import csobs2caldb
-#from @PYTHON_RELATIVE_IMPORT@csobsdef     import csobsdef
-#from @PYTHON_RELATIVE_IMPORT@csobsinfo    import csobsinfo
-#from @PYTHON_RELATIVE_IMPORT@cspull       import cspull
-#from @PYTHON_RELATIVE_IMPORT@csresmap     import csresmap
-#from @PYTHON_RELATIVE_IMPORT@cssens       import cssens
-#from @PYTHON_RELATIVE_IMPORT@csspec       import csspec
-#from @PYTHON_RELATIVE_IMPORT@cstsdist     import cstsdist
-#from @PYTHON_RELATIVE_IMPORT@cstsmapmerge import cstsmapmerge
 import cscaldb
 import csinfo
 import cslightcrv
@@ -80,10 +66,6 @@ import cstsdist
 import cstsmapmerge
 import obsutils
 if cur_version > req_version:
-    #from @PYTHON_RELATIVE_IMPORT@csfindobs    import csfindobs
-    #from @PYTHON_RELATIVE_IMPORT@csiactcopy   import csiactcopy
-    #from @PYTHON_RELATIVE_IMPORT@csiactdata   import csiactdata
-    #from @PYTHON_RELATIVE_IMPORT@csiactobs    import csiactobs
     import csfindobs
     import csiactcopy
     import csiactdata
diff --git a/cscripts/cspull.py b/cscripts/cspull.py
index 726c526..beaf0a1 100755
--- a/cscripts/cspull.py
+++ b/cscripts/cspull.py
@@ -321,7 +321,11 @@ class cspull(ctools.cscript):
             if seed == 0:
                 file   = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(file, result['colnames'])
-                writer.writerow(dict((_,_) for _ in result['colnames']))
+                headers = {}
+                for n in result['colnames']:
+                    headers[n] = n
+                writer.writerow(headers)
+                #writer.writerow(dict((_,_) for _ in result['colnames']))
             else:
                 file = open(self.m_outfile.url(), 'a')
             writer = csv.DictWriter(file, result['colnames'])
diff --git a/cscripts/cssens.py b/cscripts/cssens.py
index e7c6c56..378c5dc 100755
--- a/cscripts/cssens.py
+++ b/cscripts/cssens.py
@@ -2,7 +2,7 @@
 # ==========================================================================
 # This script computes the CTA sensitivity.
 #
-# Copyright (C) 2011-2015 Juergen Knoedlseder
+# Copyright (C) 2011-2016 Juergen Knoedlseder
 #
 # 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
@@ -251,7 +251,11 @@ class cssens(ctools.cscript):
             if ieng == 0:
                 f      = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(f, colnames)
-                writer.writerow(dict((_,_) for _ in colnames))
+                headers = {}
+                for n in colnames:
+                    headers[n] = n
+                writer.writerow(headers)
+                #writer.writerow(dict((_,_) for _ in colnames))
                 writer.writerow(result)
                 f.close()
             else:
diff --git a/cscripts/cstsdist.py b/cscripts/cstsdist.py
index 72dc384..662573b 100755
--- a/cscripts/cstsdist.py
+++ b/cscripts/cstsdist.py
@@ -251,7 +251,11 @@ class cstsdist(ctools.cscript):
             if seed == 0:
                 file   = open(self.m_outfile.url(), 'w')
                 writer = csv.DictWriter(file, result['colnames'])
-                writer.writerow(dict((_,_) for _ in result['colnames']))
+                headers = {}
+                for n in result['colnames']:
+                    headers[n] = n
+                writer.writerow(headers)
+                #writer.writerow(dict((_,_) for _ in result['colnames']))
             else:
                 file = open(self.m_outfile.url(), 'a')
             writer = csv.DictWriter(file, result['colnames'])