remove completed todo
add a fixme on a leaky abstraction