remove text-tree and make keyval a real C++ class