diff --git a/lib/hooks.c b/lib/hooks.c
index 6c24a5bf1..0505d6fc6 100644
--- a/lib/hooks.c
+++ b/lib/hooks.c
@@ -455,9 +455,6 @@ void hook_stats_header()
 	line();
 }
 
-/** @todo Come up with a better solution for this ugly workaround */
-struct list *hook_nodes = NULL;
-
 REGISTER_HOOK("stats_send", 99, hook_stats_send, HOOK_PRIVATE | HOOK_PERIODIC)
 int hook_stats_send(struct path *p, struct hook *h, int when)
 {
diff --git a/src/server.c b/src/server.c
index fec7ecf19..507f441b8 100644
--- a/src/server.c
+++ b/src/server.c
@@ -173,9 +173,6 @@ int main(int argc, char *argv[])
 		else
 			warn("No path is using the node %s. Skipping...", node_name(n));
 	}
-	
-	/** @todo This is a ugly workaround to get a reference to the node list inside the stats_send() hook */
-	extern struct list *hook_nodes = &nodes;
 
 	info("Starting paths");
 	list_foreach(struct path *p, &paths) { INDENT