Take out contains_key and clear todos.
Take out doxygen todo.