Replace TOC hack with real tree, cleanup other plugins