Add TODO
Fix memory leaks when we erase objects or entries