diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp
index 26f6513c57feda2cfccb8a18bc70564d31c9d263..8068854d37d33017a7ae19cb7c2b4a40b0817af5 100644
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@@ -63,13 +63,6 @@
 #include <sys/types.h> // mkdir(2)
 #include <sys/stat.h>  // mkdir(2)
 
-#define fill_config_str(name, value) \
-  (_config.addConfigTreeItem(section, Conf::ConfigTreeItem(std::string(name), std::string(value), type_str)))
-#define fill_config_int(name, value) \
-  (_config.addConfigTreeItem(section, Conf::ConfigTreeItem(std::string(name), std::string(value), type_int)))
-
-#define MD5_APPEND(pms,buf,len) pj_md5_update(pms, (const pj_uint8_t*)buf, len)
-
 ManagerImpl::ManagerImpl (void) :
     _hasTriedToRegister (false), _config(), _currentCallId2(),
     _currentCallMutex(), _audiodriver (0),
@@ -84,16 +77,6 @@ ManagerImpl::ManagerImpl (void) :
 {
     // initialize random generator for call id
     srand (time (NULL));
-
-#ifdef TEST
-    testAccountMap();
-    loadAccountMap();
-    testCallAccountMap();
-    unloadAccountMap();
-#endif
-
-    // should be call before initConfigFile
-    // loadAccountMap();, called in init() now.
 }
 
 // never call if we use only the singleton...
diff --git a/daemon/src/managerimpl.h b/daemon/src/managerimpl.h
index ba214bb4ef8b37910026f285ffc134030cf0678e..1dcea2ae6b7bc89d5c23bb534eec244de03ff4d3 100644
--- a/daemon/src/managerimpl.h
+++ b/daemon/src/managerimpl.h
@@ -1371,10 +1371,6 @@ class ManagerImpl
         Conf::YamlParser *parser;
         Conf::YamlEmitter *emitter;
 
-#ifdef TEST
-        bool testCallAccountMap();
-        bool testAccountMap();
-#endif
         friend class SIPTest;
         friend class ConfigurationTest;
         friend class HistoryTest;