modified:   base_node.py
	modified:   controller.py
	modified:   default.conf
	modified:   end-device.py
diff --git a/base_node.py b/base_node.py
index 1325b4f..728a107 100644
--- a/base_node.py
+++ b/base_node.py
@@ -121,14 +121,14 @@
     def getKeyChain(self):
         return self._keyChain
 
-    def getDefaultCertificateName(self):
-        try:
-            certName = self._identityStorage.getDefaultCertificateNameForIdentity( 
-                self._identityManager.getDefaultIdentity())
-        except SecurityException:
-            certName = self._keyChain.getDefaultCertificateName()
-
-        return certName
+    #def getDefaultCertificateName(self):
+    #    try:
+    #        certName = self._identityStorage.getDefaultCertificateNameForIdentity( 
+    #            self._identityManager.getDefaultIdentity())
+    #    except SecurityException:
+    #        certName = self._keyChain.getDefaultCertificateName()
+#
+ #       return certName
 
     def start(self):
         """