diff --git a/ponymap.c b/ponymap.c
index 19c6121..303654a 100644
--- a/ponymap.c
+++ b/ponymap.c
@@ -2038,8 +2038,6 @@ main (int argc, char *argv[])
 	merge_ip_ranges (&ctx);
 
 	// Initate the scan: generate as many units as possible
-	// FIXME: this appears to be quite slow: either make it run faster,
-	//   or limit the number of units spawned at a time
 	generator_init (&ctx);
 	while (generator_step (&ctx))
 		;
diff --git a/utils.c b/utils.c
index 380f978..800c31a 100644
--- a/utils.c
+++ b/utils.c
@@ -1161,6 +1161,7 @@ poller_set (struct poller *self, struct poller_fd *fd)
 		modifying ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, fd->fd, &event) != -1);
 }
 
+// FIXME: this is by far the slowest function in the whole program
 static void
 poller_remove_from_dispatch (struct poller *self, const struct poller_fd *fd)
 {