More cleanup, nodes, releases and toc