diff --git a/lib/s6a/s6a_fd.c b/lib/s6a/s6a_fd.c
index a5faf9218..311e1395c 100644
--- a/lib/s6a/s6a_fd.c
+++ b/lib/s6a/s6a_fd.c
@@ -16,8 +16,6 @@ int s6a_fd_init(const char *conffile)
 {
     int ret;
     
-    d_trace_level(&_s6a_fd, 0);
-
     gnutls_global_set_log_function(s6a_gnutls_log_func);
     gnutls_global_set_log_level(TRACE_MODULE);
 
diff --git a/lib/s6a/s6a_init.c b/lib/s6a/s6a_init.c
index b6166171a..887dda8db 100644
--- a/lib/s6a/s6a_init.c
+++ b/lib/s6a/s6a_init.c
@@ -90,8 +90,6 @@ static void * s6a_stats(void * arg)
 /* entry point */
 int s6a_init(int mode)
 {
-    d_trace_level(&_s6a_init, 0);
-
     /* Configure Application Mode(MME, HSS) */
     if (mode == MODE_HSS) 
     {
diff --git a/main.c b/main.c
index 8767ecdb7..8d0d8ceff 100644
--- a/main.c
+++ b/main.c
@@ -115,13 +115,23 @@ int main(int argc, char *argv[])
     }
 
     {
+#if 0
         extern int _mme_sm;
         extern int _enb_s1_sm;
-        extern int _s1ap_path;
+        extern int _s1dec;
+        extern int _s1enc;
+        extern int _s6a_fd;
+#endif
+        extern int _ue_emm_sm;
 
+#if 0
         d_trace_level(&_mme_sm, 100);
         d_trace_level(&_enb_s1_sm, 100);
-        d_trace_level(&_s1ap_path, 100);
+        d_trace_level(&_s1dec, 100);
+        d_trace_level(&_s1enc, 100);
+        d_trace_level(&_s6a_fd, 100);
+#endif
+        d_trace_level(&_ue_emm_sm, 100);
     }
 
     if (cellwire_initialize(config_path, log_path) != CORE_OK)