fix _remove_expired
avl_for_each_element_safe is only safe if we remove the current element
No need for hacks in main.c when we can just sleep in Make
crash a little less when nodes re-appear