diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 98c00bd901b46c265709b6e66aab34ca37f61f5d..0023cac617b6124561b504e79b7684e04811a2c5 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1935,8 +1935,7 @@ class LUSetClusterParams(LogicalUnit):
       invalid_hvs = set(self.hv_list) - constants.HYPER_TYPES
       if invalid_hvs:
         raise errors.OpPrereqError("Enabled hypervisors contains invalid"
-                                   " entries: %s" %
-                                   utils.CommaJoin(invalid_hvs))
+                                   " entries: %s" % " ,".join(invalid_hvs))
     else:
       self.hv_list = cluster.enabled_hypervisors
 
diff --git a/lib/hypervisor/hv_base.py b/lib/hypervisor/hv_base.py
index 3b06da6e57b89236a66783eae4465f00349dbeba..4eaade63f9502f34f549ca8ea89197011d6bf8b9 100644
--- a/lib/hypervisor/hv_base.py
+++ b/lib/hypervisor/hv_base.py
@@ -80,7 +80,7 @@ def ParamInSet(required, my_set):
 
   """
   fn = lambda x: x in my_set
-  err = ("The value must be one of: %s" % utils.CommaJoin(my_set))
+  err = ("The value must be one of: %s" % " ,".join(my_set))
   return (required, fn, err, None, None)
 
 
diff --git a/lib/utils.py b/lib/utils.py
index 186f14ee367ffb8fe62aea753c38523a2a98f26f..56d01087dd1f77a5e7994ec721f88c066e06d430 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -1859,16 +1859,6 @@ def SafeEncode(text):
   return resu
 
 
-def CommaJoin(names):
-  """Nicely join a set of identifiers.
-
-  @param names: set, list or tuple
-  @return: a string with the formatted results
-
-  """
-  return ", ".join(["'%s'" % val for val in names])
-
-
 def BytesToMebibyte(value):
   """Converts bytes to mebibytes.
 
diff --git a/scripts/gnt-node b/scripts/gnt-node
index a7334dbebde94fadfe57bdf7cf977acfff9eaef4..3c801ed634869cca04b1c18acfa20774a744f6bb 100755
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -72,8 +72,7 @@ _STORAGE_TYPE_OPT = \
              choices=_USER_STORAGE_TYPE.keys(),
              default=None,
              metavar="STORAGE_TYPE",
-             help=("Storage type (%s)" %
-                   utils.CommaJoin(_USER_STORAGE_TYPE.keys())))
+             help=("Storage type (%s)" % " ,".join(_USER_STORAGE_TYPE.keys())))
 
 _REPAIRABLE_STORAGE_TYPES = \
   [st for st, so in constants.VALID_STORAGE_OPERATIONS.iteritems()
diff --git a/test/docs_unittest.py b/test/docs_unittest.py
index d69066f4a8fbd13e1be3ce98d711384f17c837b9..6e66748c7143e2ed53cf75306088cfb75483bb1f 100755
--- a/test/docs_unittest.py
+++ b/test/docs_unittest.py
@@ -114,7 +114,7 @@ class TestDocs(unittest.TestCase):
 
     self.failIf(undocumented,
                 msg=("Missing RAPI resource documentation for %s" %
-                     utils.CommaJoin(undocumented)))
+                     " ,".join(undocumented)))
 
 
 class TestManpages(unittest.TestCase):
@@ -145,7 +145,7 @@ class TestManpages(unittest.TestCase):
 
     self.failIf(missing,
                 msg=("Manpage for '%s' missing documentation for %s" %
-                     (script, utils.CommaJoin(missing))))
+                     (script, " ,".join(missing))))
 
 
 if __name__ == "__main__":