diff --git a/filter/filter.c b/filter/filter.c
index f70474ad..5e848d6a 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -26,7 +26,7 @@
  * operation (okay too).
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include "nest/bird.h"
 #include "lib/lists.h"
diff --git a/nest/iface.c b/nest/iface.c
index c585a531..16961bfa 100644
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -152,7 +152,9 @@ if_notify_change(unsigned c, struct iface *i)
     }
 
   DBG("Interface change notification (%x) for %s\n", c, i->name);
+#ifdef LOCAL_DEBUG
   if_dump(i);
+#endif
 
   if (c & IF_CHANGE_UP)
     neigh_if_up(i);
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 860714e1..ef9c576b 100644
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -69,12 +69,6 @@ ospf_init(struct proto_config *c)
   return p;
 }
 
-static void
-ospf_preconfig(struct protocol *p, struct config *c)
-{
-  DBG( " OSPF: preconfig\n" );
-}
-
 static void
 ospf_postconfig(struct proto_config *c)
 {
@@ -87,7 +81,5 @@ struct protocol proto_ospf = {
   init:		ospf_init,
   dump:		ospf_dump,
   start:	ospf_start,
-  preconfig:	ospf_preconfig,
   postconfig:	ospf_postconfig,
 };
-
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 0a1bdbc6..022d499f 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -839,12 +839,6 @@ rip_init_config(struct rip_proto_config *c)
   c->authtype	= AT_NONE;
 }
 
-static void
-rip_preconfig(struct protocol *x, struct config *c)
-{
-  DBG( "RIP: preconfig\n" );
-}
-
 static int
 rip_get_attr(eattr *a, byte *buf)
 {
@@ -862,7 +856,6 @@ struct protocol proto_rip = {
   name: "RIP",
   template: "rip%d",
   attr_class: EAP_RIP,
-  preconfig: rip_preconfig,
   get_route_info: rip_get_route_info,
   get_attr: rip_get_attr,
 
diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c
index bafa2e91..3bba8585 100644
--- a/sysdep/linux/netlink/netlink.c
+++ b/sysdep/linux/netlink/netlink.c
@@ -13,7 +13,7 @@
 #include <sys/uio.h>
 #include <errno.h>
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include "nest/bird.h"
 #include "nest/route.h"
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 06d1d1dc..516c4acb 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -6,7 +6,7 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#define LOCAL_DEBUG
+#undef LOCAL_DEBUG
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -410,8 +410,9 @@ main(int argc, char **argv)
 
   cli_init_unix();
 
-  ev_run_list(&global_event_list);
-  async_dump();
+#ifdef LOCAL_DEBUG
+  async_dump_flag = 1;
+#endif
 
   DBG("Entering I/O loop.\n");