diff --git a/lib/eduGAIN_entity.php b/lib/eduGAIN_entity.php
index 71b9dbd89d013e94908dcb04cfec0bb7f1b17358..557c9d67562f109edfe7df11db33a4e409b5fba9 100644
--- a/lib/eduGAIN_entity.php
+++ b/lib/eduGAIN_entity.php
@@ -74,18 +74,6 @@ class eduGAIN_entity extends eduGAIN {
         $this->globalStats = $out;
     }
 
-    private function generateNamespaces() {
-        $out = '';
-        $q = "SELECT * FROM feed_namespaces";
-        $result = $this->databaseQuery($q);
-        while ($obj = $result->fetch_assoc()) {
-            $nskey = $obj['nskey'];
-            $nsvalue = $obj['nsvalue'];
-            $out .= $nskey . '="' . $nsvalue . '" ';
-        }
-        return $out;
-    }
-
     /**
      * Show entity metadata XML code
      */
@@ -99,13 +87,11 @@ class eduGAIN_entity extends eduGAIN {
         if (!is_numeric($entity_row_id)) {
             exit;
         }
-        $ns = $this->generateNamespaces();
         $q = "SELECT entity FROM entities WHERE id=$entity_row_id";
         $result = $this->databaseQuery($q);
         if ($obj = $result->fetch_assoc()) {
             $entityText = base64_decode($obj['entity']);
-            $entity = preg_replace('/md:EntityDescriptor /','md:EntityDescriptor ' . $ns, $entityText);
-            return($entity);
+            return($entityText);
         } else {
             die("entity search problem");
         }